Fossil SCM

Sync with trunk.

florian 2025-07-21 12:23 UTC standard-cli-colors merge

Commit e17d35e79627a0ab5294a5d69d9b0b2c1523bfd102b5ce9ba30e3df7c613230a

Parent c5f1e0daea483f3…

56 files changed +1 -1 +479 -519 +1984 -1070 +199 -153 +1 -1 +3 -3 +4 -2 +4 +1 -1 +1 -1 +7 -1 +2 -7 +11 -3 +4 -2 +1 -4 +11 +3 -2 +6 -2 +1 -1 +1 -1 +17 -7 +2 -2 +1 -1 +6 -3 +12 -4 +4 -1 +15 -2 +1 -1 +5 -3 +1 -1 +8 +53 -11 -4 +3 +4 -1 +34 -19 +4 -2 +112 -21 +82 +224 +68 +13 -7 +2 -2 +2 +2 +40 -14 +1 -1 +37 -1 +2 -2 +1 -1 +4 -4 +1 -1 +16 -18 +5 -1 +15 -11 +21 -6

~ VERSION ~ extsrc/shell.c ~ extsrc/sqlite3.c ~ extsrc/sqlite3.h ~ src/ajax.c ~ src/cgi.c ~ src/clone.c ~ src/configure.c ~ src/db.c ~ src/diff.c ~ src/diff.tcl ~ src/diffcmd.c ~ src/etag.c ~ src/forum.c ~ src/fossil.numbered-lines.js ~ src/fossil.page.forumpost.js ~ src/http.c ~ src/info.c ~ src/main.c ~ src/main.c ~ src/main.mk ~ src/manifest.c ~ src/markdown_html.c ~ src/name.c ~ src/printf.c ~ src/repolist.c ~ src/security_audit.c ~ src/setupuser.c ~ src/stat.c ~ src/tag.c ~ src/th_tcl.c ~ src/timeline.c ~ src/tkt.c ~ src/tktsetup.c ~ src/wiki.c ~ src/winfile.c ~ src/xfer.c ~ src/zip.c ~ test/link-tester.html ~ test/link-tester.js ~ test/link-tester.json ~ tools/makemake.tcl ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc ~ www/changes.wiki ~ www/containers.md ~ www/customskin.md ~ www/fossil-v-git.wiki ~ www/gsoc-ideas.md ~ www/index.wiki ~ www/quickstart.wiki ~ www/reviews.wiki ~ www/signing.md ~ www/sync.wiki ~ www/th1.md

M VERSION

+1 -1

		--- VERSION
		+++ VERSION
		@@ -1,1 +1,1 @@
1		-2.26
	1	+2.27
2	2

	--- VERSION
	+++ VERSION
	@@ -1,1 +1,1 @@
1	2.26
2

	--- VERSION
	+++ VERSION
	@@ -1,1 +1,1 @@
1	2.27
2

M extsrc/shell.c

+479 -519

		--- extsrc/shell.c
		+++ extsrc/shell.c
		@@ -1266,16 +1266,25 @@
1266	1266	return 0x3fffffff & (int)(z2 - z);
1267	1267	}
1268	1268
1269	1269	/*
1270	1270	** Return the length of a string in characters. Multibyte UTF8 characters
1271		-** count as a single character.
	1271	+** count as a single character for single-width characters, or as two
	1272	+** characters for double-width characters.
1272	1273	*/
1273	1274	static int strlenChar(const char *z){
1274	1275	int n = 0;
1275	1276	while( *z ){
1276		- if( (0xc0&*(z++))!=0x80 ) n++;
	1277	+ if( (0x80&z[0])==0 ){
	1278	+ n++;
	1279	+ z++;
	1280	+ }else{
	1281	+ int u = 0;
	1282	+ int len = decodeUtf8((const u8*)z, &u);
	1283	+ z += len;
	1284	+ n += cli_wcwidth(u);
	1285	+ }
1277	1286	}
1278	1287	return n;
1279	1288	}
1280	1289
1281	1290	/*
		@@ -1622,34 +1631,10 @@
1622	1631	if( n>350 ) n = 350;
1623	1632	sqlite3_snprintf(sizeof(z), z, "%#+.*e", n, r);
1624	1633	sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
1625	1634	}
1626	1635
1627		-
1628		-/*
1629		-** SQL function: shell_module_schema(X)
1630		-**
1631		-** Return a fake schema for the table-valued function or eponymous virtual
1632		-** table X.
1633		-*/
1634		-static void shellModuleSchema(
1635		- sqlite3_context *pCtx,
1636		- int nVal,
1637		- sqlite3_value **apVal
1638		-){
1639		- const char *zName;
1640		- char *zFake;
1641		- UNUSED_PARAMETER(nVal);
1642		- zName = (const char*)sqlite3_value_text(apVal[0]);
1643		- zFake = zName? shellFakeSchema(sqlite3_context_db_handle(pCtx), 0, zName) : 0;
1644		- if( zFake ){
1645		- sqlite3_result_text(pCtx, sqlite3_mprintf("/* %s */", zFake),
1646		- -1, sqlite3_free);
1647		- free(zFake);
1648		- }
1649		-}
1650		-
1651	1636	/*
1652	1637	** SQL function: shell_add_schema(S,X)
1653	1638	**
1654	1639	** Add the schema name X to the CREATE statement in S and return the result.
1655	1640	** Examples:
		@@ -1728,369 +1713,176 @@
1728	1713	** work here in the middle of this regular program.
1729	1714	*/
1730	1715	#define SQLITE_EXTENSION_INIT1
1731	1716	#define SQLITE_EXTENSION_INIT2(X) (void)(X)
1732	1717
1733		-#if defined(_WIN32) && defined(_MSC_VER)
1734		-/*********************** Begin test_windirent.h ****************/
	1718	+/*********************** Begin ../ext/misc/windirent.h ****************/
1735	1719	/*
1736		-** 2015 November 30
	1720	+** 2025-06-05
1737	1721	**
1738	1722	** The author disclaims copyright to this source code. In place of
1739	1723	** a legal notice, here is a blessing:
1740	1724	**
1741	1725	** May you do good and not evil.
1742	1726	** May you find forgiveness for yourself and forgive others.
1743	1727	** May you share freely, never taking more than you give.
1744	1728	**
1745	1729	*************************************************************************
1746		-** This file contains declarations for most of the opendir() family of
1747		-** POSIX functions on Win32 using the MSVCRT.
	1730	+**
	1731	+** An implementation of opendir(), readdir(), and closedir() for Windows,
	1732	+** based on the FindFirstFile(), FindNextFile(), and FindClose() APIs
	1733	+** of Win32.
	1734	+**
	1735	+** #include this file inside any C-code module that needs to use
	1736	+** opendir()/readdir()/closedir(). This file is a no-op on non-Windows
	1737	+** machines. On Windows, static functions are defined that implement
	1738	+** those standard interfaces.
1748	1739	*/
1749		-
1750	1740	#if defined(_WIN32) && defined(_MSC_VER) && !defined(SQLITE_WINDIRENT_H)
1751	1741	#define SQLITE_WINDIRENT_H
1752	1742
1753		-/*
1754		-** We need several data types from the Windows SDK header.
1755		-*/
1756		-
1757	1743	#ifndef WIN32_LEAN_AND_MEAN
1758	1744	#define WIN32_LEAN_AND_MEAN
1759	1745	#endif
1760		-
1761		-#include "windows.h"
1762		-
1763		-/*
1764		-** We need several support functions from the SQLite core.
1765		-*/
1766		-
1767		-/* #include "sqlite3.h" */
1768		-
1769		-/*
1770		-** We need several things from the ANSI and MSVCRT headers.
1771		-*/
1772		-
	1746	+#include <windows.h>
	1747	+#include <io.h>
1773	1748	#include <stdio.h>
1774	1749	#include <stdlib.h>
1775	1750	#include <errno.h>
1776		-#include <io.h>
1777	1751	#include <limits.h>
1778	1752	#include <sys/types.h>
1779	1753	#include <sys/stat.h>
1780		-
1781		-/*
1782		-** We may need several defines that should have been in "sys/stat.h".
1783		-*/
1784		-
1785		-#ifndef S_ISREG
1786		-#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
1787		-#endif
1788		-
1789		-#ifndef S_ISDIR
1790		-#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
1791		-#endif
1792		-
1793		-#ifndef S_ISLNK
1794		-#define S_ISLNK(mode) (0)
1795		-#endif
1796		-
1797		-/*
1798		-** We may need to provide the "mode_t" type.
1799		-*/
1800		-
1801		-#ifndef MODE_T_DEFINED
1802		- #define MODE_T_DEFINED
1803		- typedef unsigned short mode_t;
1804		-#endif
1805		-
1806		-/*
1807		-** We may need to provide the "ino_t" type.
1808		-*/
1809		-
1810		-#ifndef INO_T_DEFINED
1811		- #define INO_T_DEFINED
1812		- typedef unsigned short ino_t;
1813		-#endif
1814		-
1815		-/*
1816		-** We need to define "NAME_MAX" if it was not present in "limits.h".
1817		-*/
1818		-
1819		-#ifndef NAME_MAX
1820		-# ifdef FILENAME_MAX
1821		-# define NAME_MAX (FILENAME_MAX)
1822		-# else
1823		-# define NAME_MAX (260)
1824		-# endif
1825		-#endif
1826		-
1827		-/*
1828		-** We need to define "NULL_INTPTR_T" and "BAD_INTPTR_T".
1829		-*/
1830		-
1831		-#ifndef NULL_INTPTR_T
1832		-# define NULL_INTPTR_T ((intptr_t)(0))
1833		-#endif
1834		-
1835		-#ifndef BAD_INTPTR_T
1836		-# define BAD_INTPTR_T ((intptr_t)(-1))
1837		-#endif
1838		-
1839		-/*
1840		-** We need to provide the necessary structures and related types.
1841		-*/
1842		-
1843		-#ifndef DIRENT_DEFINED
1844		-#define DIRENT_DEFINED
1845		-typedef struct DIRENT DIRENT;
1846		-typedef DIRENT *LPDIRENT;
1847		-struct DIRENT {
1848		- ino_t d_ino; /* Sequence number, do not use. */
1849		- unsigned d_attributes; /* Win32 file attributes. */
1850		- char d_name[NAME_MAX + 1]; /* Name within the directory. */
1851		-};
1852		-#endif
1853		-
1854		-#ifndef DIR_DEFINED
1855		-#define DIR_DEFINED
1856		-typedef struct DIR DIR;
1857		-typedef DIR *LPDIR;
1858		-struct DIR {
1859		- intptr_t d_handle; /* Value returned by "_findfirst". */
1860		- DIRENT d_first; /* DIRENT constructed based on "_findfirst". */
1861		- DIRENT d_next; /* DIRENT constructed based on "_findnext". */
1862		-};
1863		-#endif
1864		-
1865		-/*
1866		-** Provide a macro, for use by the implementation, to determine if a
1867		-** particular directory entry should be skipped over when searching for
1868		-** the next directory entry that should be returned by the readdir() or
1869		-** readdir_r() functions.
1870		-*/
1871		-
1872		-#ifndef is_filtered
1873		-# define is_filtered(a) ((((a).attrib)&_A_HIDDEN) \|\| (((a).attrib)&_A_SYSTEM))
1874		-#endif
1875		-
1876		-/*
1877		-** Provide the function prototype for the POSIX compatible getenv()
1878		-** function. This function is not thread-safe.
1879		-*/
1880		-
1881		-extern const char windirent_getenv(const char name);
1882		-
1883		-/*
1884		-** Finally, we can provide the function prototypes for the opendir(),
1885		-** readdir(), readdir_r(), and closedir() POSIX functions.
1886		-*/
1887		-
1888		-extern LPDIR opendir(const char *dirname);
1889		-extern LPDIRENT readdir(LPDIR dirp);
1890		-extern INT readdir_r(LPDIR dirp, LPDIRENT entry, LPDIRENT *result);
1891		-extern INT closedir(LPDIR dirp);
1892		-
1893		-#endif /* defined(WIN32) && defined(_MSC_VER) */
1894		-
1895		-/*********************** End test_windirent.h ******************/
1896		-/*********************** Begin test_windirent.c ****************/
1897		-/*
1898		-** 2015 November 30
1899		-**
1900		-** The author disclaims copyright to this source code. In place of
1901		-** a legal notice, here is a blessing:
1902		-**
1903		-** May you do good and not evil.
1904		-** May you find forgiveness for yourself and forgive others.
1905		-** May you share freely, never taking more than you give.
1906		-**
1907		-*************************************************************************
1908		-** This file contains code to implement most of the opendir() family of
1909		-** POSIX functions on Win32 using the MSVCRT.
1910		-*/
1911		-
1912		-#if defined(_WIN32) && defined(_MSC_VER)
1913		-/* #include "test_windirent.h" */
1914		-
1915		-/*
1916		-** Implementation of the POSIX getenv() function using the Win32 API.
1917		-** This function is not thread-safe.
1918		-*/
1919		-const char *windirent_getenv(
1920		- const char *name
1921		-){
1922		- static char value[32768]; /* Maximum length, per MSDN */
1923		- DWORD dwSize = sizeof(value) / sizeof(char); /* Size in chars */
1924		- DWORD dwRet; /* Value returned by GetEnvironmentVariableA() */
1925		-
1926		- memset(value, 0, sizeof(value));
1927		- dwRet = GetEnvironmentVariableA(name, value, dwSize);
1928		- if( dwRet==0 \|\| dwRet>dwSize ){
1929		- /*
1930		- ** The function call to GetEnvironmentVariableA() failed -OR-
1931		- ** the buffer is not large enough. Either way, return NULL.
1932		- */
1933		- return 0;
1934		- }else{
1935		- /*
1936		- ** The function call to GetEnvironmentVariableA() succeeded
1937		- ** -AND- the buffer contains the entire value.
1938		- */
1939		- return value;
1940		- }
1941		-}
1942		-
1943		-/*
1944		-** Implementation of the POSIX opendir() function using the MSVCRT.
1945		-*/
1946		-LPDIR opendir(
1947		- const char *dirname
1948		-){
1949		- struct _finddata_t data;
1950		- LPDIR dirp = (LPDIR)sqlite3_malloc(sizeof(DIR));
1951		- SIZE_T namesize = sizeof(data.name) / sizeof(data.name[0]);
1952		-
1953		- if( dirp==NULL ) return NULL;
1954		- memset(dirp, 0, sizeof(DIR));
1955		-
1956		- /* TODO: Remove this if Unix-style root paths are not used. */
1957		- if( sqlite3_stricmp(dirname, "/")==0 ){
1958		- dirname = windirent_getenv("SystemDrive");
1959		- }
1960		-
1961		- memset(&data, 0, sizeof(struct _finddata_t));
1962		- _snprintf(data.name, namesize, "%s\\*", dirname);
1963		- dirp->d_handle = _findfirst(data.name, &data);
1964		-
1965		- if( dirp->d_handle==BAD_INTPTR_T ){
1966		- closedir(dirp);
1967		- return NULL;
1968		- }
1969		-
1970		- /* TODO: Remove this block to allow hidden and/or system files. */
1971		- if( is_filtered(data) ){
1972		-next:
1973		-
1974		- memset(&data, 0, sizeof(struct _finddata_t));
1975		- if( _findnext(dirp->d_handle, &data)==-1 ){
1976		- closedir(dirp);
1977		- return NULL;
1978		- }
1979		-
1980		- /* TODO: Remove this block to allow hidden and/or system files. */
1981		- if( is_filtered(data) ) goto next;
1982		- }
1983		-
1984		- dirp->d_first.d_attributes = data.attrib;
1985		- strncpy(dirp->d_first.d_name, data.name, NAME_MAX);
1986		- dirp->d_first.d_name[NAME_MAX] = '\0';
1987		-
1988		- return dirp;
1989		-}
1990		-
1991		-/*
1992		-** Implementation of the POSIX readdir() function using the MSVCRT.
1993		-*/
1994		-LPDIRENT readdir(
1995		- LPDIR dirp
1996		-){
1997		- struct _finddata_t data;
1998		-
1999		- if( dirp==NULL ) return NULL;
2000		-
2001		- if( dirp->d_first.d_ino==0 ){
2002		- dirp->d_first.d_ino++;
2003		- dirp->d_next.d_ino++;
2004		-
2005		- return &dirp->d_first;
2006		- }
2007		-
2008		-next:
2009		-
2010		- memset(&data, 0, sizeof(struct _finddata_t));
2011		- if( _findnext(dirp->d_handle, &data)==-1 ) return NULL;
2012		-
2013		- /* TODO: Remove this block to allow hidden and/or system files. */
2014		- if( is_filtered(data) ) goto next;
2015		-
2016		- dirp->d_next.d_ino++;
2017		- dirp->d_next.d_attributes = data.attrib;
2018		- strncpy(dirp->d_next.d_name, data.name, NAME_MAX);
2019		- dirp->d_next.d_name[NAME_MAX] = '\0';
2020		-
2021		- return &dirp->d_next;
2022		-}
2023		-
2024		-/*
2025		-** Implementation of the POSIX readdir_r() function using the MSVCRT.
2026		-*/
2027		-INT readdir_r(
2028		- LPDIR dirp,
2029		- LPDIRENT entry,
2030		- LPDIRENT *result
2031		-){
2032		- struct _finddata_t data;
2033		-
2034		- if( dirp==NULL ) return EBADF;
2035		-
2036		- if( dirp->d_first.d_ino==0 ){
2037		- dirp->d_first.d_ino++;
2038		- dirp->d_next.d_ino++;
2039		-
2040		- entry->d_ino = dirp->d_first.d_ino;
2041		- entry->d_attributes = dirp->d_first.d_attributes;
2042		- strncpy(entry->d_name, dirp->d_first.d_name, NAME_MAX);
2043		- entry->d_name[NAME_MAX] = '\0';
2044		-
2045		- *result = entry;
2046		- return 0;
2047		- }
2048		-
2049		-next:
2050		-
2051		- memset(&data, 0, sizeof(struct _finddata_t));
2052		- if( _findnext(dirp->d_handle, &data)==-1 ){
2053		- *result = NULL;
2054		- return ENOENT;
2055		- }
2056		-
2057		- /* TODO: Remove this block to allow hidden and/or system files. */
2058		- if( is_filtered(data) ) goto next;
2059		-
2060		- entry->d_ino = (ino_t)-1; /* not available */
2061		- entry->d_attributes = data.attrib;
2062		- strncpy(entry->d_name, data.name, NAME_MAX);
2063		- entry->d_name[NAME_MAX] = '\0';
2064		-
2065		- *result = entry;
2066		- return 0;
2067		-}
2068		-
2069		-/*
2070		-** Implementation of the POSIX closedir() function using the MSVCRT.
2071		-*/
2072		-INT closedir(
2073		- LPDIR dirp
2074		-){
2075		- INT result = 0;
2076		-
2077		- if( dirp==NULL ) return EINVAL;
2078		-
2079		- if( dirp->d_handle!=NULL_INTPTR_T && dirp->d_handle!=BAD_INTPTR_T ){
2080		- result = _findclose(dirp->d_handle);
2081		- }
2082		-
2083		- sqlite3_free(dirp);
2084		- return result;
2085		-}
2086		-
2087		-#endif /* defined(WIN32) && defined(_MSC_VER) */
2088		-
2089		-/*********************** End test_windirent.c ******************/
2090		-#define dirent DIRENT
2091		-#endif
	1754	+#include <string.h>
	1755	+#ifndef FILENAME_MAX
	1756	+# define FILENAME_MAX (260)
	1757	+#endif
	1758	+#ifndef S_ISREG
	1759	+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
	1760	+#endif
	1761	+#ifndef S_ISDIR
	1762	+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
	1763	+#endif
	1764	+#ifndef S_ISLNK
	1765	+#define S_ISLNK(m) (0)
	1766	+#endif
	1767	+typedef unsigned short mode_t;
	1768	+
	1769	+/* The dirent object for Windows is abbreviated. The only field really
	1770	+** usable by applications is d_name[].
	1771	+*/
	1772	+struct dirent {
	1773	+ int d_ino; /* Inode number (synthesized) */
	1774	+ unsigned d_attributes; /* File attributes */
	1775	+ char d_name[FILENAME_MAX]; /* Null-terminated filename */
	1776	+};
	1777	+
	1778	+/* The internals of DIR are opaque according to standards. So it
	1779	+** does not matter what we put here. */
	1780	+typedef struct DIR DIR;
	1781	+struct DIR {
	1782	+ intptr_t d_handle; /* Handle for findfirst()/findnext() */
	1783	+ struct dirent cur; /* Current entry */
	1784	+};
	1785	+
	1786	+/* Ignore hidden and system files */
	1787	+#define WindowsFileToIgnore(a) \
	1788	+ ((((a).attrib)&_A_HIDDEN) \|\| (((a).attrib)&_A_SYSTEM))
	1789	+
	1790	+/*
	1791	+** Close a previously opened directory
	1792	+*/
	1793	+static int closedir(DIR *pDir){
	1794	+ int rc = 0;
	1795	+ if( pDir==0 ){
	1796	+ return EINVAL;
	1797	+ }
	1798	+ if( pDir->d_handle!=0 && pDir->d_handle!=(-1) ){
	1799	+ rc = _findclose(pDir->d_handle);
	1800	+ }
	1801	+ sqlite3_free(pDir);
	1802	+ return rc;
	1803	+}
	1804	+
	1805	+/*
	1806	+** Open a new directory. The directory name should be UTF-8 encoded.
	1807	+** appropriate translations happen automatically.
	1808	+*/
	1809	+static DIR opendir(const char zDirName){
	1810	+ DIR *pDir;
	1811	+ wchar_t *b1;
	1812	+ sqlite3_int64 sz;
	1813	+ struct _wfinddata_t data;
	1814	+
	1815	+ pDir = sqlite3_malloc64( sizeof(DIR) );
	1816	+ if( pDir==0 ) return 0;
	1817	+ memset(pDir, 0, sizeof(DIR));
	1818	+ memset(&data, 0, sizeof(data));
	1819	+ sz = strlen(zDirName);
	1820	+ b1 = sqlite3_malloc64( (sz+3)*sizeof(b1[0]) );
	1821	+ if( b1==0 ){
	1822	+ closedir(pDir);
	1823	+ return NULL;
	1824	+ }
	1825	+ sz = MultiByteToWideChar(CP_UTF8, 0, zDirName, sz, b1, sz);
	1826	+ b1[sz++] = '\\';
	1827	+ b1[sz++] = '*';
	1828	+ b1[sz] = 0;
	1829	+ if( sz+1>sizeof(data.name)/sizeof(data.name[0]) ){
	1830	+ closedir(pDir);
	1831	+ sqlite3_free(b1);
	1832	+ return NULL;
	1833	+ }
	1834	+ memcpy(data.name, b1, (sz+1)*sizeof(b1[0]));
	1835	+ sqlite3_free(b1);
	1836	+ pDir->d_handle = _wfindfirst(data.name, &data);
	1837	+ if( pDir->d_handle<0 ){
	1838	+ closedir(pDir);
	1839	+ return NULL;
	1840	+ }
	1841	+ while( WindowsFileToIgnore(data) ){
	1842	+ memset(&data, 0, sizeof(data));
	1843	+ if( _wfindnext(pDir->d_handle, &data)==-1 ){
	1844	+ closedir(pDir);
	1845	+ return NULL;
	1846	+ }
	1847	+ }
	1848	+ pDir->cur.d_ino = 0;
	1849	+ pDir->cur.d_attributes = data.attrib;
	1850	+ WideCharToMultiByte(CP_UTF8, 0, data.name, -1,
	1851	+ pDir->cur.d_name, FILENAME_MAX, 0, 0);
	1852	+ return pDir;
	1853	+}
	1854	+
	1855	+/*
	1856	+** Read the next entry from a directory.
	1857	+**
	1858	+** The returned struct-dirent object is managed by DIR. It is only
	1859	+** valid until the next readdir() or closedir() call. Only the
	1860	+** d_name[] field is meaningful. The d_name[] value has been
	1861	+** translated into UTF8.
	1862	+*/
	1863	+static struct dirent readdir(DIR pDir){
	1864	+ struct _wfinddata_t data;
	1865	+ if( pDir==0 ) return 0;
	1866	+ if( (pDir->cur.d_ino++)==0 ){
	1867	+ return &pDir->cur;
	1868	+ }
	1869	+ do{
	1870	+ memset(&data, 0, sizeof(data));
	1871	+ if( _wfindnext(pDir->d_handle, &data)==-1 ){
	1872	+ return NULL;
	1873	+ }
	1874	+ }while( WindowsFileToIgnore(data) );
	1875	+ pDir->cur.d_attributes = data.attrib;
	1876	+ WideCharToMultiByte(CP_UTF8, 0, data.name, -1,
	1877	+ pDir->cur.d_name, FILENAME_MAX, 0, 0);
	1878	+ return &pDir->cur;
	1879	+}
	1880	+
	1881	+#endif /* defined(_WIN32) && defined(_MSC_VER) */
	1882	+
	1883	+/*********************** End ../ext/misc/windirent.h ******************/
2092	1884	/*********************** Begin ../ext/misc/memtrace.c ****************/
2093	1885	/*
2094	1886	** 2019-01-21
2095	1887	**
2096	1888	** The author disclaims copyright to this source code. In place of
		@@ -8054,10 +7846,11 @@
8054	7846	** mode: Value of stat.st_mode for directory entry (an integer).
8055	7847	** mtime: Value of stat.st_mtime for directory entry (an integer).
8056	7848	** data: For a regular file, a blob containing the file data. For a
8057	7849	** symlink, a text value containing the text of the link. For a
8058	7850	** directory, NULL.
	7851	+** level: Directory hierarchy level. Topmost is 1.
8059	7852	**
8060	7853	** If a non-NULL value is specified for the optional $dir parameter and
8061	7854	** $path is a relative path, then $path is interpreted relative to $dir.
8062	7855	** And the paths returned in the "name" column of the table are also
8063	7856	** relative to directory $dir.
		@@ -8079,24 +7872,17 @@
8079	7872	#if !defined(_WIN32) && !defined(WIN32)
8080	7873	# include <unistd.h>
8081	7874	# include <dirent.h>
8082	7875	# include <utime.h>
8083	7876	# include <sys/time.h>
	7877	+# define STRUCT_STAT struct stat
8084	7878	#else
8085		-# include "windows.h"
8086		-# include <io.h>
	7879	+/* # include "windirent.h" */
8087	7880	# include <direct.h>
8088		-/* # include "test_windirent.h" */
8089		-# define dirent DIRENT
8090		-# ifndef chmod
8091		-# define chmod _chmod
8092		-# endif
8093		-# ifndef stat
8094		-# define stat _stat
8095		-# endif
8096		-# define mkdir(path,mode) _mkdir(path)
8097		-# define lstat(path,buf) stat(path,buf)
	7881	+# define STRUCT_STAT struct _stat
	7882	+# define chmod(path,mode) fileio_chmod(path,mode)
	7883	+# define mkdir(path,mode) fileio_mkdir(path)
8098	7884	#endif
8099	7885	#include <time.h>
8100	7886	#include <errno.h>
8101	7887
8102	7888	/* When used as part of the CLI, the sqlite3_stdio.h module will have
		@@ -8108,18 +7894,54 @@
8108	7894	#endif
8109	7895
8110	7896	/*
8111	7897	** Structure of the fsdir() table-valued function
8112	7898	*/
8113		- /* 0 1 2 3 4 5 */
8114		-#define FSDIR_SCHEMA "(name,mode,mtime,data,path HIDDEN,dir HIDDEN)"
	7899	+ /* 0 1 2 3 4 5 6 */
	7900	+#define FSDIR_SCHEMA "(name,mode,mtime,data,level,path HIDDEN,dir HIDDEN)"
	7901	+
8115	7902	#define FSDIR_COLUMN_NAME 0 /* Name of the file */
8116	7903	#define FSDIR_COLUMN_MODE 1 /* Access mode */
8117	7904	#define FSDIR_COLUMN_MTIME 2 /* Last modification time */
8118	7905	#define FSDIR_COLUMN_DATA 3 /* File content */
8119		-#define FSDIR_COLUMN_PATH 4 /* Path to top of search */
8120		-#define FSDIR_COLUMN_DIR 5 /* Path is relative to this directory */
	7906	+#define FSDIR_COLUMN_LEVEL 4 /* Level. Topmost is 1 */
	7907	+#define FSDIR_COLUMN_PATH 5 /* Path to top of search */
	7908	+#define FSDIR_COLUMN_DIR 6 /* Path is relative to this directory */
	7909	+
	7910	+/*
	7911	+** UTF8 chmod() function for Windows
	7912	+*/
	7913	+#if defined(_WIN32) \|\| defined(WIN32)
	7914	+static int fileio_chmod(const char *zPath, int pmode){
	7915	+ sqlite3_int64 sz = strlen(zPath);
	7916	+ wchar_t b1 = sqlite3_malloc64( (sz+1)sizeof(b1[0]) );
	7917	+ int rc;
	7918	+ if( b1==0 ) return -1;
	7919	+ sz = MultiByteToWideChar(CP_UTF8, 0, zPath, sz, b1, sz);
	7920	+ b1[sz] = 0;
	7921	+ rc = _wchmod(b1, pmode);
	7922	+ sqlite3_free(b1);
	7923	+ return rc;
	7924	+}
	7925	+#endif
	7926	+
	7927	+/*
	7928	+** UTF8 mkdir() function for Windows
	7929	+*/
	7930	+#if defined(_WIN32) \|\| defined(WIN32)
	7931	+static int fileio_mkdir(const char *zPath){
	7932	+ sqlite3_int64 sz = strlen(zPath);
	7933	+ wchar_t b1 = sqlite3_malloc64( (sz+1)sizeof(b1[0]) );
	7934	+ int rc;
	7935	+ if( b1==0 ) return -1;
	7936	+ sz = MultiByteToWideChar(CP_UTF8, 0, zPath, sz, b1, sz);
	7937	+ b1[sz] = 0;
	7938	+ rc = _wmkdir(b1);
	7939	+ sqlite3_free(b1);
	7940	+ return rc;
	7941	+}
	7942	+#endif
8121	7943
8122	7944
8123	7945	/*
8124	7946	** Set the result stored by context ctx to a blob containing the
8125	7947	** contents of file zName. Or, leave the result unchanged (NULL)
		@@ -8247,11 +8069,11 @@
8247	8069	** buffer to UTC. This is necessary on Win32, where the runtime library
8248	8070	** appears to return these values as local times.
8249	8071	*/
8250	8072	static void statTimesToUtc(
8251	8073	const char *zPath,
8252		- struct stat *pStatBuf
	8074	+ STRUCT_STAT *pStatBuf
8253	8075	){
8254	8076	HANDLE hFindFile;
8255	8077	WIN32_FIND_DATAW fd;
8256	8078	LPWSTR zUnicodeName;
8257	8079	extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
		@@ -8275,14 +8097,20 @@
8275	8097	** is required in order for the included time to be returned as UTC. On all
8276	8098	** other systems, this function simply calls stat().
8277	8099	*/
8278	8100	static int fileStat(
8279	8101	const char *zPath,
8280		- struct stat *pStatBuf
	8102	+ STRUCT_STAT *pStatBuf
8281	8103	){
8282	8104	#if defined(_WIN32)
8283		- int rc = stat(zPath, pStatBuf);
	8105	+ sqlite3_int64 sz = strlen(zPath);
	8106	+ wchar_t b1 = sqlite3_malloc64( (sz+1)sizeof(b1[0]) );
	8107	+ int rc;
	8108	+ if( b1==0 ) return 1;
	8109	+ sz = MultiByteToWideChar(CP_UTF8, 0, zPath, sz, b1, sz);
	8110	+ b1[sz] = 0;
	8111	+ rc = _wstat(b1, pStatBuf);
8284	8112	if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
8285	8113	return rc;
8286	8114	#else
8287	8115	return stat(zPath, pStatBuf);
8288	8116	#endif
		@@ -8293,16 +8121,14 @@
8293	8121	** is required in order for the included time to be returned as UTC. On all
8294	8122	** other systems, this function simply calls lstat().
8295	8123	*/
8296	8124	static int fileLinkStat(
8297	8125	const char *zPath,
8298		- struct stat *pStatBuf
	8126	+ STRUCT_STAT *pStatBuf
8299	8127	){
8300	8128	#if defined(_WIN32)
8301		- int rc = lstat(zPath, pStatBuf);
8302		- if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
8303		- return rc;
	8129	+ return fileStat(zPath, pStatBuf);
8304	8130	#else
8305	8131	return lstat(zPath, pStatBuf);
8306	8132	#endif
8307	8133	}
8308	8134
		@@ -8328,11 +8154,11 @@
8328	8154	}else{
8329	8155	int nCopy = (int)strlen(zCopy);
8330	8156	int i = 1;
8331	8157
8332	8158	while( rc==SQLITE_OK ){
8333		- struct stat sStat;
	8159	+ STRUCT_STAT sStat;
8334	8160	int rc2;
8335	8161
8336	8162	for(; zCopy[i]!='/' && i<nCopy; i++);
8337	8163	if( i==nCopy ) break;
8338	8164	zCopy[i] = '\0';
		@@ -8378,11 +8204,11 @@
8378	8204	if( mkdir(zFile, mode) ){
8379	8205	/* The mkdir() call to create the directory failed. This might not
8380	8206	** be an error though - if there is already a directory at the same
8381	8207	** path and either the permissions already match or can be changed
8382	8208	** to do so using chmod(), it is not an error. */
8383		- struct stat sStat;
	8209	+ STRUCT_STAT sStat;
8384	8210	if( errno!=EEXIST
8385	8211	\|\| 0!=fileStat(zFile, &sStat)
8386	8212	\|\| !S_ISDIR(sStat.st_mode)
8387	8213	\|\| ((sStat.st_mode&0777)!=(mode&0777) && 0!=chmod(zFile, mode&0777))
8388	8214	){
		@@ -8574,17 +8400,18 @@
8574	8400
8575	8401	struct fsdir_cursor {
8576	8402	sqlite3_vtab_cursor base; /* Base class - must be first */
8577	8403
8578	8404	int nLvl; /* Number of entries in aLvl[] array */
	8405	+ int mxLvl; /* Maximum level */
8579	8406	int iLvl; /* Index of current entry */
8580	8407	FsdirLevel aLvl; / Hierarchy of directories being traversed */
8581	8408
8582	8409	const char *zBase;
8583	8410	int nBase;
8584	8411
8585		- struct stat sStat; /* Current lstat() results */
	8412	+ STRUCT_STAT sStat; /* Current lstat() results */
8586	8413	char zPath; / Path to current entry */
8587	8414	sqlite3_int64 iRowid; /* Current rowid */
8588	8415	};
8589	8416
8590	8417	typedef struct fsdir_tab fsdir_tab;
		@@ -8692,11 +8519,11 @@
8692	8519	static int fsdirNext(sqlite3_vtab_cursor *cur){
8693	8520	fsdir_cursor pCur = (fsdir_cursor)cur;
8694	8521	mode_t m = pCur->sStat.st_mode;
8695	8522
8696	8523	pCur->iRowid++;
8697		- if( S_ISDIR(m) ){
	8524	+ if( S_ISDIR(m) && pCur->iLvl+3<pCur->mxLvl ){
8698	8525	/* Descend into this directory */
8699	8526	int iNew = pCur->iLvl + 1;
8700	8527	FsdirLevel *pLvl;
8701	8528	if( iNew>=pCur->nLvl ){
8702	8529	int nNew = iNew+1;
		@@ -8800,11 +8627,15 @@
8800	8627	if( aBuf!=aStatic ) sqlite3_free(aBuf);
8801	8628	#endif
8802	8629	}else{
8803	8630	readFileContents(ctx, pCur->zPath);
8804	8631	}
	8632	+ break;
8805	8633	}
	8634	+ case FSDIR_COLUMN_LEVEL:
	8635	+ sqlite3_result_int(ctx, pCur->iLvl+2);
	8636	+ break;
8806	8637	case FSDIR_COLUMN_PATH:
8807	8638	default: {
8808	8639	/* The FSDIR_COLUMN_PATH and FSDIR_COLUMN_DIR are input parameters.
8809	8640	** always return their values as NULL */
8810	8641	break;
		@@ -8834,36 +8665,50 @@
8834	8665	}
8835	8666
8836	8667	/*
8837	8668	** xFilter callback.
8838	8669	**
8839		-** idxNum==1 PATH parameter only
8840		-** idxNum==2 Both PATH and DIR supplied
	8670	+** idxNum bit Meaning
	8671	+** 0x01 PATH=N
	8672	+** 0x02 DIR=N
	8673	+** 0x04 LEVEL<N
	8674	+** 0x08 LEVEL<=N
8841	8675	*/
8842	8676	static int fsdirFilter(
8843	8677	sqlite3_vtab_cursor *cur,
8844	8678	int idxNum, const char *idxStr,
8845	8679	int argc, sqlite3_value **argv
8846	8680	){
8847	8681	const char *zDir = 0;
8848	8682	fsdir_cursor pCur = (fsdir_cursor)cur;
	8683	+ int i;
8849	8684	(void)idxStr;
8850	8685	fsdirResetCursor(pCur);
8851	8686
8852	8687	if( idxNum==0 ){
8853	8688	fsdirSetErrmsg(pCur, "table function fsdir requires an argument");
8854	8689	return SQLITE_ERROR;
8855	8690	}
8856	8691
8857		- assert( argc==idxNum && (argc==1 \|\| argc==2) );
	8692	+ assert( (idxNum & 0x01)!=0 && argc>0 );
8858	8693	zDir = (const char*)sqlite3_value_text(argv[0]);
8859	8694	if( zDir==0 ){
8860	8695	fsdirSetErrmsg(pCur, "table function fsdir requires a non-NULL argument");
8861	8696	return SQLITE_ERROR;
8862	8697	}
8863		- if( argc==2 ){
8864		- pCur->zBase = (const char*)sqlite3_value_text(argv[1]);
	8698	+ i = 1;
	8699	+ if( (idxNum & 0x02)!=0 ){
	8700	+ assert( argc>i );
	8701	+ pCur->zBase = (const char*)sqlite3_value_text(argv[i++]);
	8702	+ }
	8703	+ if( (idxNum & 0x0c)!=0 ){
	8704	+ assert( argc>i );
	8705	+ pCur->mxLvl = sqlite3_value_int(argv[i++]);
	8706	+ if( idxNum & 0x08 ) pCur->mxLvl++;
	8707	+ if( pCur->mxLvl<=0 ) pCur->mxLvl = 1000000000;
	8708	+ }else{
	8709	+ pCur->mxLvl = 1000000000;
8865	8710	}
8866	8711	if( pCur->zBase ){
8867	8712	pCur->nBase = (int)strlen(pCur->zBase)+1;
8868	8713	pCur->zPath = sqlite3_mprintf("%s/%s", pCur->zBase, zDir);
8869	8714	}else{
		@@ -8888,48 +8733,75 @@
8888	8733	** plan.
8889	8734	**
8890	8735	** In this implementation idxNum is used to represent the
8891	8736	** query plan. idxStr is unused.
8892	8737	**
8893		-** The query plan is represented by values of idxNum:
	8738	+** The query plan is represented by bits in idxNum:
8894	8739	**
8895		-** (1) The path value is supplied by argv[0]
8896		-** (2) Path is in argv[0] and dir is in argv[1]
	8740	+** 0x01 The path value is supplied by argv[0]
	8741	+** 0x02 dir is in argv[1]
	8742	+** 0x04 maxdepth is in argv[1] or [2]
8897	8743	*/
8898	8744	static int fsdirBestIndex(
8899	8745	sqlite3_vtab *tab,
8900	8746	sqlite3_index_info *pIdxInfo
8901	8747	){
8902	8748	int i; /* Loop over constraints */
8903	8749	int idxPath = -1; /* Index in pIdxInfo->aConstraint of PATH= */
8904	8750	int idxDir = -1; /* Index in pIdxInfo->aConstraint of DIR= */
	8751	+ int idxLevel = -1; /* Index in pIdxInfo->aConstraint of LEVEL< or <= */
	8752	+ int idxLevelEQ = 0; /* 0x08 for LEVEL<= or LEVEL=. 0x04 for LEVEL< */
	8753	+ int omitLevel = 0; /* omit the LEVEL constraint */
8905	8754	int seenPath = 0; /* True if an unusable PATH= constraint is seen */
8906	8755	int seenDir = 0; /* True if an unusable DIR= constraint is seen */
8907	8756	const struct sqlite3_index_constraint *pConstraint;
8908	8757
8909	8758	(void)tab;
8910	8759	pConstraint = pIdxInfo->aConstraint;
8911	8760	for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
8912		- if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
8913		- switch( pConstraint->iColumn ){
8914		- case FSDIR_COLUMN_PATH: {
8915		- if( pConstraint->usable ){
8916		- idxPath = i;
8917		- seenPath = 0;
8918		- }else if( idxPath<0 ){
8919		- seenPath = 1;
8920		- }
8921		- break;
8922		- }
8923		- case FSDIR_COLUMN_DIR: {
8924		- if( pConstraint->usable ){
8925		- idxDir = i;
8926		- seenDir = 0;
8927		- }else if( idxDir<0 ){
8928		- seenDir = 1;
8929		- }
8930		- break;
	8761	+ if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
	8762	+ switch( pConstraint->iColumn ){
	8763	+ case FSDIR_COLUMN_PATH: {
	8764	+ if( pConstraint->usable ){
	8765	+ idxPath = i;
	8766	+ seenPath = 0;
	8767	+ }else if( idxPath<0 ){
	8768	+ seenPath = 1;
	8769	+ }
	8770	+ break;
	8771	+ }
	8772	+ case FSDIR_COLUMN_DIR: {
	8773	+ if( pConstraint->usable ){
	8774	+ idxDir = i;
	8775	+ seenDir = 0;
	8776	+ }else if( idxDir<0 ){
	8777	+ seenDir = 1;
	8778	+ }
	8779	+ break;
	8780	+ }
	8781	+ case FSDIR_COLUMN_LEVEL: {
	8782	+ if( pConstraint->usable && idxLevel<0 ){
	8783	+ idxLevel = i;
	8784	+ idxLevelEQ = 0x08;
	8785	+ omitLevel = 0;
	8786	+ }
	8787	+ break;
	8788	+ }
	8789	+ }
	8790	+ }else
	8791	+ if( pConstraint->iColumn==FSDIR_COLUMN_LEVEL
	8792	+ && pConstraint->usable
	8793	+ && idxLevel<0
	8794	+ ){
	8795	+ if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_LE ){
	8796	+ idxLevel = i;
	8797	+ idxLevelEQ = 0x08;
	8798	+ omitLevel = 1;
	8799	+ }else if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_LT ){
	8800	+ idxLevel = i;
	8801	+ idxLevelEQ = 0x04;
	8802	+ omitLevel = 1;
8931	8803	}
8932	8804	}
8933	8805	}
8934	8806	if( seenPath \|\| seenDir ){
8935	8807	/* If input parameters are unusable, disallow this plan */
		@@ -8942,18 +8814,24 @@
8942	8814	** number. Leave it unchanged. */
8943	8815	pIdxInfo->estimatedRows = 0x7fffffff;
8944	8816	}else{
8945	8817	pIdxInfo->aConstraintUsage[idxPath].omit = 1;
8946	8818	pIdxInfo->aConstraintUsage[idxPath].argvIndex = 1;
	8819	+ pIdxInfo->idxNum = 0x01;
	8820	+ pIdxInfo->estimatedCost = 1.0e9;
	8821	+ i = 2;
8947	8822	if( idxDir>=0 ){
8948	8823	pIdxInfo->aConstraintUsage[idxDir].omit = 1;
8949		- pIdxInfo->aConstraintUsage[idxDir].argvIndex = 2;
8950		- pIdxInfo->idxNum = 2;
8951		- pIdxInfo->estimatedCost = 10.0;
8952		- }else{
8953		- pIdxInfo->idxNum = 1;
8954		- pIdxInfo->estimatedCost = 100.0;
	8824	+ pIdxInfo->aConstraintUsage[idxDir].argvIndex = i++;
	8825	+ pIdxInfo->idxNum \|= 0x02;
	8826	+ pIdxInfo->estimatedCost /= 1.0e4;
	8827	+ }
	8828	+ if( idxLevel>=0 ){
	8829	+ pIdxInfo->aConstraintUsage[idxLevel].omit = omitLevel;
	8830	+ pIdxInfo->aConstraintUsage[idxLevel].argvIndex = i++;
	8831	+ pIdxInfo->idxNum \|= idxLevelEQ;
	8832	+ pIdxInfo->estimatedCost /= 1.0e4;
8955	8833	}
8956	8834	}
8957	8835
8958	8836	return SQLITE_OK;
8959	8837	}
		@@ -16808,11 +16686,11 @@
16808	16686	case SQLITE_FCNTL_POWERSAFE_OVERWRITE: zOp = "POWERSAFE_OVERWRITE"; break;
16809	16687	case SQLITE_FCNTL_PRAGMA: {
16810	16688	const char const a = (const charconst)pArg;
16811	16689	if( a[1] && strcmp(a[1],"vfstrace")==0 && a[2] ){
16812	16690	const u8 zArg = (const u8)a[2];
16813		- if( zArg[0]>='0' && zArg[0]<=9 ){
	16691	+ if( zArg[0]>='0' && zArg[0]<='9' ){
16814	16692	pInfo->mTrace = (sqlite3_uint64)strtoll(a[2], 0, 0);
16815	16693	}else{
16816	16694	static const struct {
16817	16695	const char *z;
16818	16696	unsigned int m;
		@@ -18709,10 +18587,13 @@
18709	18587	rc = sqlite3_create_module(db, "sqlite_dbptr", &dbdata_module, (void*)1);
18710	18588	}
18711	18589	return rc;
18712	18590	}
18713	18591
	18592	+#ifdef _WIN32
	18593	+
	18594	+#endif
18714	18595	int sqlite3_dbdata_init(
18715	18596	sqlite3 *db,
18716	18597	char **pzErrMsg,
18717	18598	const sqlite3_api_routines *pApi
18718	18599	){
		@@ -25592,107 +25473,108 @@
25592	25473	" --plain Show results as text/plain, not as HTML",
25593	25474	#endif
25594	25475	};
25595	25476
25596	25477	/*
25597		-** Output help text.
	25478	+** Output help text for commands that match zPattern.
	25479	+**
	25480	+** * If zPattern is NULL, then show all documented commands, but
	25481	+** only give a one-line summary of each.
	25482	+**
	25483	+** * If zPattern is "-a" or "-all" or "--all" then show all help text
	25484	+** for all commands except undocumented commands.
	25485	+**
	25486	+** * If zPattern is "0" then show all help for undocumented commands.
	25487	+** Undocumented commands begin with "," instead of "." in the azHelp[]
	25488	+** array.
	25489	+**
	25490	+** * If zPattern is a prefix for one or more documented commands, then
	25491	+** show help for those commands. If only a single command matches the
	25492	+** prefix, show the full text of the help. If multiple commands match,
	25493	+** Only show just the first line of each.
25598	25494	**
25599		-** zPattern describes the set of commands for which help text is provided.
25600		-** If zPattern is NULL, then show all commands, but only give a one-line
25601		-** description of each.
	25495	+** * Otherwise, show the complete text of any documented command for which
	25496	+** zPattern is a LIKE match for any text within that command help
	25497	+** text.
25602	25498	**
25603		-** Return the number of matches.
	25499	+** Return the number commands that match zPattern.
25604	25500	*/
25605	25501	static int showHelp(FILE out, const char zPattern){
25606	25502	int i = 0;
25607	25503	int j = 0;
25608	25504	int n = 0;
25609	25505	char *zPat;
25610		- if( zPattern==0
25611		- \|\| zPattern[0]=='0'
25612		- \|\| cli_strcmp(zPattern,"-a")==0
25613		- \|\| cli_strcmp(zPattern,"-all")==0
25614		- \|\| cli_strcmp(zPattern,"--all")==0
25615		- ){
25616		- enum HelpWanted { HW_NoCull = 0, HW_SummaryOnly = 1, HW_Undoc = 2 };
25617		- enum HelpHave { HH_Undoc = 2, HH_Summary = 1, HH_More = 0 };
25618		- /* Show all or most commands
25619		- ** *zPattern==0 => summary of documented commands only
25620		- ** *zPattern=='0' => whole help for undocumented commands
25621		- ** Otherwise => whole help for documented commands
25622		- */
25623		- enum HelpWanted hw = HW_SummaryOnly;
25624		- enum HelpHave hh = HH_More;
25625		- if( zPattern!=0 ){
25626		- hw = (*zPattern=='0')? HW_NoCull\|HW_Undoc : HW_NoCull;
25627		- }
25628		- for(i=0; i<ArraySize(azHelp); i++){
25629		- switch( azHelp[i][0] ){
25630		- case ',':
25631		- hh = HH_Summary\|HH_Undoc;
25632		- break;
25633		- case '.':
25634		- hh = HH_Summary;
25635		- break;
25636		- default:
25637		- hh &= ~HH_Summary;
25638		- break;
25639		- }
25640		- if( ((hw^hh)&HH_Undoc)==0 ){
25641		- if( (hh&HH_Summary)!=0 ){
25642		- sqlite3_fprintf(out, ".%s\n", azHelp[i]+1);
25643		- ++n;
25644		- }else if( (hw&HW_SummaryOnly)==0 ){
25645		- sqlite3_fprintf(out, "%s\n", azHelp[i]);
25646		- }
25647		- }
25648		- }
25649		- }else{
25650		- /* Seek documented commands for which zPattern is an exact prefix */
25651		- zPat = sqlite3_mprintf(".%s*", zPattern);
25652		- shell_check_oom(zPat);
25653		- for(i=0; i<ArraySize(azHelp); i++){
25654		- if( sqlite3_strglob(zPat, azHelp[i])==0 ){
25655		- sqlite3_fprintf(out, "%s\n", azHelp[i]);
25656		- j = i+1;
25657		- n++;
25658		- }
25659		- }
25660		- sqlite3_free(zPat);
25661		- if( n ){
25662		- if( n==1 ){
25663		- /* when zPattern is a prefix of exactly one command, then include
25664		- ** the details of that command, which should begin at offset j */
25665		- while( j<ArraySize(azHelp)-1 && azHelp[j][0]==' ' ){
25666		- sqlite3_fprintf(out, "%s\n", azHelp[j]);
25667		- j++;
25668		- }
25669		- }
25670		- return n;
25671		- }
25672		- /* Look for documented commands that contain zPattern anywhere.
25673		- ** Show complete text of all documented commands that match. */
25674		- zPat = sqlite3_mprintf("%%%s%%", zPattern);
25675		- shell_check_oom(zPat);
25676		- for(i=0; i<ArraySize(azHelp); i++){
25677		- if( azHelp[i][0]==',' ){
25678		- while( i<ArraySize(azHelp)-1 && azHelp[i+1][0]==' ' ) ++i;
25679		- continue;
25680		- }
25681		- if( azHelp[i][0]=='.' ) j = i;
25682		- if( sqlite3_strlike(zPat, azHelp[i], 0)==0 ){
25683		- sqlite3_fprintf(out, "%s\n", azHelp[j]);
25684		- while( j<ArraySize(azHelp)-1 && azHelp[j+1][0]==' ' ){
25685		- j++;
25686		- sqlite3_fprintf(out, "%s\n", azHelp[j]);
25687		- }
25688		- i = j;
25689		- n++;
25690		- }
25691		- }
25692		- sqlite3_free(zPat);
25693		- }
	25506	+ if( zPattern==0 ){
	25507	+ /* Show just the first line for all help topics */
	25508	+ zPattern = "[a-z]";
	25509	+ }else if( cli_strcmp(zPattern,"-a")==0
	25510	+ \|\| cli_strcmp(zPattern,"-all")==0
	25511	+ \|\| cli_strcmp(zPattern,"--all")==0
	25512	+ ){
	25513	+ /* Show everything except undocumented commands */
	25514	+ zPattern = ".";
	25515	+ }else if( cli_strcmp(zPattern,"0")==0 ){
	25516	+ /* Show complete help text of undocumented commands */
	25517	+ int show = 0;
	25518	+ for(i=0; i<ArraySize(azHelp); i++){
	25519	+ if( azHelp[i][0]=='.' ){
	25520	+ show = 0;
	25521	+ }else if( azHelp[i][0]==',' ){
	25522	+ show = 1;
	25523	+ sqlite3_fprintf(out, ".%s\n", &azHelp[i][1]);
	25524	+ n++;
	25525	+ }else if( show ){
	25526	+ sqlite3_fprintf(out, "%s\n", azHelp[i]);
	25527	+ }
	25528	+ }
	25529	+ return n;
	25530	+ }
	25531	+
	25532	+ /* Seek documented commands for which zPattern is an exact prefix */
	25533	+ zPat = sqlite3_mprintf(".%s*", zPattern);
	25534	+ shell_check_oom(zPat);
	25535	+ for(i=0; i<ArraySize(azHelp); i++){
	25536	+ if( sqlite3_strglob(zPat, azHelp[i])==0 ){
	25537	+ sqlite3_fprintf(out, "%s\n", azHelp[i]);
	25538	+ j = i+1;
	25539	+ n++;
	25540	+ }
	25541	+ }
	25542	+ sqlite3_free(zPat);
	25543	+ if( n ){
	25544	+ if( n==1 ){
	25545	+ /* when zPattern is a prefix of exactly one command, then include
	25546	+ ** the details of that command, which should begin at offset j */
	25547	+ while( j<ArraySize(azHelp)-1 && azHelp[j][0]==' ' ){
	25548	+ sqlite3_fprintf(out, "%s\n", azHelp[j]);
	25549	+ j++;
	25550	+ }
	25551	+ }
	25552	+ return n;
	25553	+ }
	25554	+
	25555	+ /* Look for documented commands that contain zPattern anywhere.
	25556	+ ** Show complete text of all documented commands that match. */
	25557	+ zPat = sqlite3_mprintf("%%%s%%", zPattern);
	25558	+ shell_check_oom(zPat);
	25559	+ for(i=0; i<ArraySize(azHelp); i++){
	25560	+ if( azHelp[i][0]==',' ){
	25561	+ while( i<ArraySize(azHelp)-1 && azHelp[i+1][0]==' ' ) ++i;
	25562	+ continue;
	25563	+ }
	25564	+ if( azHelp[i][0]=='.' ) j = i;
	25565	+ if( sqlite3_strlike(zPat, azHelp[i], 0)==0 ){
	25566	+ sqlite3_fprintf(out, "%s\n", azHelp[j]);
	25567	+ while( j<ArraySize(azHelp)-1 && azHelp[j+1][0]==' ' ){
	25568	+ j++;
	25569	+ sqlite3_fprintf(out, "%s\n", azHelp[j]);
	25570	+ }
	25571	+ i = j;
	25572	+ n++;
	25573	+ }
	25574	+ }
	25575	+ sqlite3_free(zPat);
25694	25576	return n;
25695	25577	}
25696	25578
25697	25579	/* Forward reference */
25698	25580	static int process_input(ShellState *p);
		@@ -25937,10 +25819,43 @@
25937	25819	int sleep = sqlite3_value_int(argv[0]);
25938	25820	(void)argcUnused;
25939	25821	sqlite3_sleep(sleep/1000);
25940	25822	sqlite3_result_int(context, sleep);
25941	25823	}
	25824	+
	25825	+/*
	25826	+** SQL function: shell_module_schema(X)
	25827	+**
	25828	+** Return a fake schema for the table-valued function or eponymous virtual
	25829	+** table X.
	25830	+*/
	25831	+static void shellModuleSchema(
	25832	+ sqlite3_context *pCtx,
	25833	+ int nVal,
	25834	+ sqlite3_value **apVal
	25835	+){
	25836	+ const char *zName;
	25837	+ char *zFake;
	25838	+ ShellState p = (ShellState)sqlite3_user_data(pCtx);
	25839	+ FILE *pSavedLog = p->pLog;
	25840	+ UNUSED_PARAMETER(nVal);
	25841	+ zName = (const char*)sqlite3_value_text(apVal[0]);
	25842	+
	25843	+ /* Temporarily disable the ".log" when calling shellFakeSchema() because
	25844	+ ** shellFakeSchema() might generate failures for some ephemeral virtual
	25845	+ ** tables due to missing arguments. Example: fts4aux.
	25846	+ ** https://sqlite.org/forum/forumpost/42fe6520b803be51 */
	25847	+ p->pLog = 0;
	25848	+ zFake = zName? shellFakeSchema(sqlite3_context_db_handle(pCtx), 0, zName) : 0;
	25849	+ p->pLog = pSavedLog;
	25850	+
	25851	+ if( zFake ){
	25852	+ sqlite3_result_text(pCtx, sqlite3_mprintf("/* %s */", zFake),
	25853	+ -1, sqlite3_free);
	25854	+ free(zFake);
	25855	+ }
	25856	+}
25942	25857
25943	25858	/* Flags for open_db().
25944	25859	**
25945	25860	** The default behavior of open_db() is to exit(1) if the database fails to
25946	25861	** open. The OPEN_DB_KEEPALIVE flag changes that so that it prints an error
		@@ -26081,11 +25996,11 @@
26081	25996	shellDtostr, 0, 0);
26082	25997	sqlite3_create_function(p->db, "dtostr", 2, SQLITE_UTF8, 0,
26083	25998	shellDtostr, 0, 0);
26084	25999	sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
26085	26000	shellAddSchemaName, 0, 0);
26086		- sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
	26001	+ sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, p,
26087	26002	shellModuleSchema, 0, 0);
26088	26003	sqlite3_create_function(p->db, "shell_putsnl", 1, SQLITE_UTF8, p,
26089	26004	shellPutsFunc, 0, 0);
26090	26005	sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
26091	26006	shellUSleepFunc, 0, 0);
		@@ -29541,11 +29456,12 @@
29541	29456	rc = sqlite3_exec(p->db,
29542	29457	"SELECT sql FROM"
29543	29458	" (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
29544	29459	" FROM sqlite_schema UNION ALL"
29545	29460	" SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_schema) "
29546		- "WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "
	29461	+ "WHERE type!='meta' AND sql NOTNULL"
	29462	+ " AND name NOT LIKE 'sqlite__%' ESCAPE '_' "
29547	29463	"ORDER BY x",
29548	29464	callback, &data, 0
29549	29465	);
29550	29466	if( rc==SQLITE_OK ){
29551	29467	sqlite3_stmt *pStmt;
		@@ -31017,11 +30933,11 @@
31017	30933	}
31018	30934	appendText(&sSelect, " AND ", 0);
31019	30935	sqlite3_free(zQarg);
31020	30936	}
31021	30937	if( bNoSystemTabs ){
31022		- appendText(&sSelect, "name NOT LIKE 'sqlite_%%' AND ", 0);
	30938	+ appendText(&sSelect, "name NOT LIKE 'sqlite__%%' ESCAPE '_' AND ", 0);
31023	30939	}
31024	30940	appendText(&sSelect, "sql IS NOT NULL"
31025	30941	" ORDER BY snum, rowid", 0);
31026	30942	if( bDebug ){
31027	30943	sqlite3_fprintf(p->out, "SQL: %s;\n", sSelect.z);
		@@ -31448,11 +31364,11 @@
31448	31364	" UNION ALL SELECT 'sqlite_schema'"
31449	31365	" ORDER BY 1 collate nocase";
31450	31366	}else{
31451	31367	zSql = "SELECT lower(name) as tname FROM sqlite_schema"
31452	31368	" WHERE type='table' AND coalesce(rootpage,0)>1"
31453		- " AND name NOT LIKE 'sqlite_%'"
	31369	+ " AND name NOT LIKE 'sqlite__%' ESCAPE '_'"
31454	31370	" ORDER BY 1 collate nocase";
31455	31371	}
31456	31372	sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
31457	31373	initText(&sQuery);
31458	31374	initText(&sSql);
		@@ -31513,11 +31429,11 @@
31513	31429	{
31514	31430	int lrc;
31515	31431	char zRevText = / Query for reversible to-blob-to-text check */
31516	31432	"SELECT lower(name) as tname FROM sqlite_schema\n"
31517	31433	"WHERE type='table' AND coalesce(rootpage,0)>1\n"
31518		- "AND name NOT LIKE 'sqlite_%%'%s\n"
	31434	+ "AND name NOT LIKE 'sqlite__%%' ESCAPE '_'%s\n"
31519	31435	"ORDER BY 1 collate nocase";
31520	31436	zRevText = sqlite3_mprintf(zRevText, zLike? " AND name LIKE $tspec" : "");
31521	31437	zRevText = sqlite3_mprintf(
31522	31438	/* lower-case query is first run, producing upper-case query. */
31523	31439	"with tabcols as materialized(\n"
		@@ -31709,11 +31625,11 @@
31709	31625	}
31710	31626	appendText(&s, zDbName, '"');
31711	31627	appendText(&s, ".sqlite_schema ", 0);
31712	31628	if( c=='t' ){
31713	31629	appendText(&s," WHERE type IN ('table','view')"
31714		- " AND name NOT LIKE 'sqlite_%'"
	31630	+ " AND name NOT LIKE 'sqlite__%' ESCAPE '_'"
31715	31631	" AND name LIKE ?1", 0);
31716	31632	}else{
31717	31633	appendText(&s," WHERE type='index'"
31718	31634	" AND tbl_name LIKE ?1", 0);
31719	31635	}
		@@ -31803,11 +31719,11 @@
31803	31719	const char zUsage; / Usage notes */
31804	31720	} aCtrl[] = {
31805	31721	{"always", SQLITE_TESTCTRL_ALWAYS, 1, "BOOLEAN" },
31806	31722	{"assert", SQLITE_TESTCTRL_ASSERT, 1, "BOOLEAN" },
31807	31723	/{"benign_malloc_hooks",SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS,1, "" },/
31808		- /{"bitvec_test", SQLITE_TESTCTRL_BITVEC_TEST, 1, "" },/
	31724	+ {"bitvec_test", SQLITE_TESTCTRL_BITVEC_TEST, 1, "SIZE INT-ARRAY"},
31809	31725	{"byteorder", SQLITE_TESTCTRL_BYTEORDER, 0, "" },
31810	31726	{"extra_schema_checks",SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS,0,"BOOLEAN" },
31811	31727	{"fault_install", SQLITE_TESTCTRL_FAULT_INSTALL, 1,"args..." },
31812	31728	{"fk_no_action", SQLITE_TESTCTRL_FK_NO_ACTION, 0, "BOOLEAN" },
31813	31729	{"imposter", SQLITE_TESTCTRL_IMPOSTER,1,"SCHEMA ON/OFF ROOTPAGE"},
		@@ -31922,10 +31838,11 @@
31922	31838	{ 0x02000000, 1, "Coroutines" },
31923	31839	{ 0x04000000, 1, "NullUnusedCols" },
31924	31840	{ 0x08000000, 1, "OnePass" },
31925	31841	{ 0x10000000, 1, "OrderBySubq" },
31926	31842	{ 0x20000000, 1, "StarQuery" },
	31843	+ { 0x40000000, 1, "ExistsToJoin" },
31927	31844	{ 0xffffffff, 0, "All" },
31928	31845	};
31929	31846	unsigned int curOpt;
31930	31847	unsigned int newOpt;
31931	31848	unsigned int m;
		@@ -32141,10 +32058,53 @@
32141	32058	rc2 = booleanValue(azArg[2]);
32142	32059	isOk = 3;
32143	32060	}
32144	32061	sqlite3_test_control(testctrl, &rc2);
32145	32062	break;
	32063	+ case SQLITE_TESTCTRL_BITVEC_TEST: {
	32064	+ /* Examples:
	32065	+ ** .testctrl bitvec_test 100 6,1 -- Show BITVEC constants
	32066	+ ** .testctrl bitvec_test 1000 1,12,7,3 -- Simple test
	32067	+ ** ---- --------
	32068	+ ** size of Bitvec -----^ ^--- aOp array. 0 added at end.
	32069	+ **
	32070	+ ** See comments on sqlite3BitvecBuiltinTest() for more information
	32071	+ ** about the aOp[] array.
	32072	+ */
	32073	+ int iSize;
	32074	+ const char *zTestArg;
	32075	+ int nOp;
	32076	+ int ii, jj, x;
	32077	+ int *aOp;
	32078	+ if( nArg!=4 ){
	32079	+ sqlite3_fprintf(stderr,
	32080	+ "ERROR - should be: \".testctrl bitvec_test SIZE INT-ARRAY\"\n"
	32081	+ );
	32082	+ rc = 1;
	32083	+ goto meta_command_exit;
	32084	+ }
	32085	+ isOk = 3;
	32086	+ iSize = (int)integerValue(azArg[2]);
	32087	+ zTestArg = azArg[3];
	32088	+ nOp = (int)strlen(zTestArg)+1;
	32089	+ aOp = malloc( sizeof(int)*(nOp+1) );
	32090	+ shell_check_oom(aOp);
	32091	+ memset(aOp, 0, sizeof(int)*(nOp+1) );
	32092	+ for(ii = jj = x = 0; zTestArg[ii]!=0; ii++){
	32093	+ if( IsDigit(zTestArg[ii]) ){
	32094	+ x = x*10 + zTestArg[ii] - '0';
	32095	+ }else{
	32096	+ aOp[jj++] = x;
	32097	+ x = 0;
	32098	+ }
	32099	+ }
	32100	+ aOp[jj] = x;
	32101	+ x = sqlite3_test_control(testctrl, iSize, aOp);
	32102	+ sqlite3_fprintf(p->out, "result: %d\n", x);
	32103	+ free(aOp);
	32104	+ break;
	32105	+ }
32146	32106	case SQLITE_TESTCTRL_FAULT_INSTALL: {
32147	32107	int kk;
32148	32108	int bShowHelp = nArg<=2;
32149	32109	isOk = 3;
32150	32110	for(kk=2; kk<nArg; kk++){
32151	32111

	--- extsrc/shell.c
	+++ extsrc/shell.c
	@@ -1266,16 +1266,25 @@
1266	return 0x3fffffff & (int)(z2 - z);
1267	}
1268
1269	/*
1270	** Return the length of a string in characters. Multibyte UTF8 characters
1271	** count as a single character.

1272	*/
1273	static int strlenChar(const char *z){
1274	int n = 0;
1275	while( *z ){
1276	if( (0xc0&*(z++))!=0x80 ) n++;








1277	}
1278	return n;
1279	}
1280
1281	/*
	@@ -1622,34 +1631,10 @@
1622	if( n>350 ) n = 350;
1623	sqlite3_snprintf(sizeof(z), z, "%#+.*e", n, r);
1624	sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
1625	}
1626
1627
1628	/*
1629	** SQL function: shell_module_schema(X)
1630	**
1631	** Return a fake schema for the table-valued function or eponymous virtual
1632	** table X.
1633	*/
1634	static void shellModuleSchema(
1635	sqlite3_context *pCtx,
1636	int nVal,
1637	sqlite3_value **apVal
1638	){
1639	const char *zName;
1640	char *zFake;
1641	UNUSED_PARAMETER(nVal);
1642	zName = (const char*)sqlite3_value_text(apVal[0]);
1643	zFake = zName? shellFakeSchema(sqlite3_context_db_handle(pCtx), 0, zName) : 0;
1644	if( zFake ){
1645	sqlite3_result_text(pCtx, sqlite3_mprintf("/* %s */", zFake),
1646	-1, sqlite3_free);
1647	free(zFake);
1648	}
1649	}
1650
1651	/*
1652	** SQL function: shell_add_schema(S,X)
1653	**
1654	** Add the schema name X to the CREATE statement in S and return the result.
1655	** Examples:
	@@ -1728,369 +1713,176 @@
1728	** work here in the middle of this regular program.
1729	*/
1730	#define SQLITE_EXTENSION_INIT1
1731	#define SQLITE_EXTENSION_INIT2(X) (void)(X)
1732
1733	#if defined(_WIN32) && defined(_MSC_VER)
1734	/*********************** Begin test_windirent.h ****************/
1735	/*
1736	** 2015 November 30
1737	**
1738	** The author disclaims copyright to this source code. In place of
1739	** a legal notice, here is a blessing:
1740	**
1741	** May you do good and not evil.
1742	** May you find forgiveness for yourself and forgive others.
1743	** May you share freely, never taking more than you give.
1744	**
1745	*************************************************************************
1746	** This file contains declarations for most of the opendir() family of
1747	** POSIX functions on Win32 using the MSVCRT.







1748	*/
1749
1750	#if defined(_WIN32) && defined(_MSC_VER) && !defined(SQLITE_WINDIRENT_H)
1751	#define SQLITE_WINDIRENT_H
1752
1753	/*
1754	** We need several data types from the Windows SDK header.
1755	*/
1756
1757	#ifndef WIN32_LEAN_AND_MEAN
1758	#define WIN32_LEAN_AND_MEAN
1759	#endif
1760
1761	#include "windows.h"
1762
1763	/*
1764	** We need several support functions from the SQLite core.
1765	*/
1766
1767	/* #include "sqlite3.h" */
1768
1769	/*
1770	** We need several things from the ANSI and MSVCRT headers.
1771	*/
1772
1773	#include <stdio.h>
1774	#include <stdlib.h>
1775	#include <errno.h>
1776	#include <io.h>
1777	#include <limits.h>
1778	#include <sys/types.h>
1779	#include <sys/stat.h>
1780
1781	/*
1782	** We may need several defines that should have been in "sys/stat.h".
1783	*/
1784
1785	#ifndef S_ISREG
1786	#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
1787	#endif
1788
1789	#ifndef S_ISDIR
1790	#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
1791	#endif
1792
1793	#ifndef S_ISLNK
1794	#define S_ISLNK(mode) (0)
1795	#endif
1796
1797	/*
1798	** We may need to provide the "mode_t" type.
1799	*/
1800
1801	#ifndef MODE_T_DEFINED
1802	#define MODE_T_DEFINED
1803	typedef unsigned short mode_t;
1804	#endif
1805
1806	/*
1807	** We may need to provide the "ino_t" type.
1808	*/
1809
1810	#ifndef INO_T_DEFINED
1811	#define INO_T_DEFINED
1812	typedef unsigned short ino_t;
1813	#endif
1814
1815	/*
1816	** We need to define "NAME_MAX" if it was not present in "limits.h".
1817	*/
1818
1819	#ifndef NAME_MAX
1820	# ifdef FILENAME_MAX
1821	# define NAME_MAX (FILENAME_MAX)
1822	# else
1823	# define NAME_MAX (260)
1824	# endif
1825	#endif
1826
1827	/*
1828	** We need to define "NULL_INTPTR_T" and "BAD_INTPTR_T".
1829	*/
1830
1831	#ifndef NULL_INTPTR_T
1832	# define NULL_INTPTR_T ((intptr_t)(0))
1833	#endif
1834
1835	#ifndef BAD_INTPTR_T
1836	# define BAD_INTPTR_T ((intptr_t)(-1))
1837	#endif
1838
1839	/*
1840	** We need to provide the necessary structures and related types.
1841	*/
1842
1843	#ifndef DIRENT_DEFINED
1844	#define DIRENT_DEFINED
1845	typedef struct DIRENT DIRENT;
1846	typedef DIRENT *LPDIRENT;
1847	struct DIRENT {
1848	ino_t d_ino; /* Sequence number, do not use. */
1849	unsigned d_attributes; /* Win32 file attributes. */
1850	char d_name[NAME_MAX + 1]; /* Name within the directory. */
1851	};
1852	#endif
1853
1854	#ifndef DIR_DEFINED
1855	#define DIR_DEFINED
1856	typedef struct DIR DIR;
1857	typedef DIR *LPDIR;
1858	struct DIR {
1859	intptr_t d_handle; /* Value returned by "_findfirst". */
1860	DIRENT d_first; /* DIRENT constructed based on "_findfirst". */
1861	DIRENT d_next; /* DIRENT constructed based on "_findnext". */
1862	};
1863	#endif
1864
1865	/*
1866	** Provide a macro, for use by the implementation, to determine if a
1867	** particular directory entry should be skipped over when searching for
1868	** the next directory entry that should be returned by the readdir() or
1869	** readdir_r() functions.
1870	*/
1871
1872	#ifndef is_filtered
1873	# define is_filtered(a) ((((a).attrib)&_A_HIDDEN) \|\| (((a).attrib)&_A_SYSTEM))
1874	#endif
1875
1876	/*
1877	** Provide the function prototype for the POSIX compatible getenv()
1878	** function. This function is not thread-safe.
1879	*/
1880
1881	extern const char windirent_getenv(const char name);
1882
1883	/*
1884	** Finally, we can provide the function prototypes for the opendir(),
1885	** readdir(), readdir_r(), and closedir() POSIX functions.
1886	*/
1887
1888	extern LPDIR opendir(const char *dirname);
1889	extern LPDIRENT readdir(LPDIR dirp);
1890	extern INT readdir_r(LPDIR dirp, LPDIRENT entry, LPDIRENT *result);
1891	extern INT closedir(LPDIR dirp);
1892
1893	#endif /* defined(WIN32) && defined(_MSC_VER) */
1894
1895	/*********************** End test_windirent.h ******************/
1896	/*********************** Begin test_windirent.c ****************/
1897	/*
1898	** 2015 November 30
1899	**
1900	** The author disclaims copyright to this source code. In place of
1901	** a legal notice, here is a blessing:
1902	**
1903	** May you do good and not evil.
1904	** May you find forgiveness for yourself and forgive others.
1905	** May you share freely, never taking more than you give.
1906	**
1907	*************************************************************************
1908	** This file contains code to implement most of the opendir() family of
1909	** POSIX functions on Win32 using the MSVCRT.
1910	*/
1911
1912	#if defined(_WIN32) && defined(_MSC_VER)
1913	/* #include "test_windirent.h" */
1914
1915	/*
1916	** Implementation of the POSIX getenv() function using the Win32 API.
1917	** This function is not thread-safe.
1918	*/
1919	const char *windirent_getenv(
1920	const char *name
1921	){
1922	static char value[32768]; /* Maximum length, per MSDN */
1923	DWORD dwSize = sizeof(value) / sizeof(char); /* Size in chars */
1924	DWORD dwRet; /* Value returned by GetEnvironmentVariableA() */
1925
1926	memset(value, 0, sizeof(value));
1927	dwRet = GetEnvironmentVariableA(name, value, dwSize);
1928	if( dwRet==0 \|\| dwRet>dwSize ){
1929	/*
1930	** The function call to GetEnvironmentVariableA() failed -OR-
1931	** the buffer is not large enough. Either way, return NULL.
1932	*/
1933	return 0;
1934	}else{
1935	/*
1936	** The function call to GetEnvironmentVariableA() succeeded
1937	** -AND- the buffer contains the entire value.
1938	*/
1939	return value;
1940	}
1941	}
1942
1943	/*
1944	** Implementation of the POSIX opendir() function using the MSVCRT.
1945	*/
1946	LPDIR opendir(
1947	const char *dirname
1948	){
1949	struct _finddata_t data;
1950	LPDIR dirp = (LPDIR)sqlite3_malloc(sizeof(DIR));
1951	SIZE_T namesize = sizeof(data.name) / sizeof(data.name[0]);
1952
1953	if( dirp==NULL ) return NULL;
1954	memset(dirp, 0, sizeof(DIR));
1955
1956	/* TODO: Remove this if Unix-style root paths are not used. */
1957	if( sqlite3_stricmp(dirname, "/")==0 ){
1958	dirname = windirent_getenv("SystemDrive");
1959	}
1960
1961	memset(&data, 0, sizeof(struct _finddata_t));
1962	_snprintf(data.name, namesize, "%s\\*", dirname);
1963	dirp->d_handle = _findfirst(data.name, &data);
1964
1965	if( dirp->d_handle==BAD_INTPTR_T ){
1966	closedir(dirp);
1967	return NULL;
1968	}
1969
1970	/* TODO: Remove this block to allow hidden and/or system files. */
1971	if( is_filtered(data) ){
1972	next:
1973
1974	memset(&data, 0, sizeof(struct _finddata_t));
1975	if( _findnext(dirp->d_handle, &data)==-1 ){
1976	closedir(dirp);
1977	return NULL;
1978	}
1979
1980	/* TODO: Remove this block to allow hidden and/or system files. */
1981	if( is_filtered(data) ) goto next;
1982	}
1983
1984	dirp->d_first.d_attributes = data.attrib;
1985	strncpy(dirp->d_first.d_name, data.name, NAME_MAX);
1986	dirp->d_first.d_name[NAME_MAX] = '\0';
1987
1988	return dirp;
1989	}
1990
1991	/*
1992	** Implementation of the POSIX readdir() function using the MSVCRT.
1993	*/
1994	LPDIRENT readdir(
1995	LPDIR dirp
1996	){
1997	struct _finddata_t data;
1998
1999	if( dirp==NULL ) return NULL;
2000
2001	if( dirp->d_first.d_ino==0 ){
2002	dirp->d_first.d_ino++;
2003	dirp->d_next.d_ino++;
2004
2005	return &dirp->d_first;
2006	}
2007
2008	next:
2009
2010	memset(&data, 0, sizeof(struct _finddata_t));
2011	if( _findnext(dirp->d_handle, &data)==-1 ) return NULL;
2012
2013	/* TODO: Remove this block to allow hidden and/or system files. */
2014	if( is_filtered(data) ) goto next;
2015
2016	dirp->d_next.d_ino++;
2017	dirp->d_next.d_attributes = data.attrib;
2018	strncpy(dirp->d_next.d_name, data.name, NAME_MAX);
2019	dirp->d_next.d_name[NAME_MAX] = '\0';
2020
2021	return &dirp->d_next;
2022	}
2023
2024	/*
2025	** Implementation of the POSIX readdir_r() function using the MSVCRT.
2026	*/
2027	INT readdir_r(
2028	LPDIR dirp,
2029	LPDIRENT entry,
2030	LPDIRENT *result
2031	){
2032	struct _finddata_t data;
2033
2034	if( dirp==NULL ) return EBADF;
2035
2036	if( dirp->d_first.d_ino==0 ){
2037	dirp->d_first.d_ino++;
2038	dirp->d_next.d_ino++;
2039
2040	entry->d_ino = dirp->d_first.d_ino;
2041	entry->d_attributes = dirp->d_first.d_attributes;
2042	strncpy(entry->d_name, dirp->d_first.d_name, NAME_MAX);
2043	entry->d_name[NAME_MAX] = '\0';
2044
2045	*result = entry;
2046	return 0;
2047	}
2048
2049	next:
2050
2051	memset(&data, 0, sizeof(struct _finddata_t));
2052	if( _findnext(dirp->d_handle, &data)==-1 ){
2053	*result = NULL;
2054	return ENOENT;
2055	}
2056
2057	/* TODO: Remove this block to allow hidden and/or system files. */
2058	if( is_filtered(data) ) goto next;
2059
2060	entry->d_ino = (ino_t)-1; /* not available */
2061	entry->d_attributes = data.attrib;
2062	strncpy(entry->d_name, data.name, NAME_MAX);
2063	entry->d_name[NAME_MAX] = '\0';
2064
2065	*result = entry;
2066	return 0;
2067	}
2068
2069	/*
2070	** Implementation of the POSIX closedir() function using the MSVCRT.
2071	*/
2072	INT closedir(
2073	LPDIR dirp
2074	){
2075	INT result = 0;
2076
2077	if( dirp==NULL ) return EINVAL;
2078
2079	if( dirp->d_handle!=NULL_INTPTR_T && dirp->d_handle!=BAD_INTPTR_T ){
2080	result = _findclose(dirp->d_handle);
2081	}
2082
2083	sqlite3_free(dirp);
2084	return result;
2085	}
2086
2087	#endif /* defined(WIN32) && defined(_MSC_VER) */
2088
2089	/*********************** End test_windirent.c ******************/
2090	#define dirent DIRENT
2091	#endif
2092	/*********************** Begin ../ext/misc/memtrace.c ****************/
2093	/*
2094	** 2019-01-21
2095	**
2096	** The author disclaims copyright to this source code. In place of
	@@ -8054,10 +7846,11 @@
8054	** mode: Value of stat.st_mode for directory entry (an integer).
8055	** mtime: Value of stat.st_mtime for directory entry (an integer).
8056	** data: For a regular file, a blob containing the file data. For a
8057	** symlink, a text value containing the text of the link. For a
8058	** directory, NULL.

8059	**
8060	** If a non-NULL value is specified for the optional $dir parameter and
8061	** $path is a relative path, then $path is interpreted relative to $dir.
8062	** And the paths returned in the "name" column of the table are also
8063	** relative to directory $dir.
	@@ -8079,24 +7872,17 @@
8079	#if !defined(_WIN32) && !defined(WIN32)
8080	# include <unistd.h>
8081	# include <dirent.h>
8082	# include <utime.h>
8083	# include <sys/time.h>

8084	#else
8085	# include "windows.h"
8086	# include <io.h>
8087	# include <direct.h>
8088	/* # include "test_windirent.h" */
8089	# define dirent DIRENT
8090	# ifndef chmod
8091	# define chmod _chmod
8092	# endif
8093	# ifndef stat
8094	# define stat _stat
8095	# endif
8096	# define mkdir(path,mode) _mkdir(path)
8097	# define lstat(path,buf) stat(path,buf)
8098	#endif
8099	#include <time.h>
8100	#include <errno.h>
8101
8102	/* When used as part of the CLI, the sqlite3_stdio.h module will have
	@@ -8108,18 +7894,54 @@
8108	#endif
8109
8110	/*
8111	** Structure of the fsdir() table-valued function
8112	*/
8113	/* 0 1 2 3 4 5 */
8114	#define FSDIR_SCHEMA "(name,mode,mtime,data,path HIDDEN,dir HIDDEN)"

8115	#define FSDIR_COLUMN_NAME 0 /* Name of the file */
8116	#define FSDIR_COLUMN_MODE 1 /* Access mode */
8117	#define FSDIR_COLUMN_MTIME 2 /* Last modification time */
8118	#define FSDIR_COLUMN_DATA 3 /* File content */
8119	#define FSDIR_COLUMN_PATH 4 /* Path to top of search */
8120	#define FSDIR_COLUMN_DIR 5 /* Path is relative to this directory */



































8121
8122
8123	/*
8124	** Set the result stored by context ctx to a blob containing the
8125	** contents of file zName. Or, leave the result unchanged (NULL)
	@@ -8247,11 +8069,11 @@
8247	** buffer to UTC. This is necessary on Win32, where the runtime library
8248	** appears to return these values as local times.
8249	*/
8250	static void statTimesToUtc(
8251	const char *zPath,
8252	struct stat *pStatBuf
8253	){
8254	HANDLE hFindFile;
8255	WIN32_FIND_DATAW fd;
8256	LPWSTR zUnicodeName;
8257	extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
	@@ -8275,14 +8097,20 @@
8275	** is required in order for the included time to be returned as UTC. On all
8276	** other systems, this function simply calls stat().
8277	*/
8278	static int fileStat(
8279	const char *zPath,
8280	struct stat *pStatBuf
8281	){
8282	#if defined(_WIN32)
8283	int rc = stat(zPath, pStatBuf);






8284	if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
8285	return rc;
8286	#else
8287	return stat(zPath, pStatBuf);
8288	#endif
	@@ -8293,16 +8121,14 @@
8293	** is required in order for the included time to be returned as UTC. On all
8294	** other systems, this function simply calls lstat().
8295	*/
8296	static int fileLinkStat(
8297	const char *zPath,
8298	struct stat *pStatBuf
8299	){
8300	#if defined(_WIN32)
8301	int rc = lstat(zPath, pStatBuf);
8302	if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
8303	return rc;
8304	#else
8305	return lstat(zPath, pStatBuf);
8306	#endif
8307	}
8308
	@@ -8328,11 +8154,11 @@
8328	}else{
8329	int nCopy = (int)strlen(zCopy);
8330	int i = 1;
8331
8332	while( rc==SQLITE_OK ){
8333	struct stat sStat;
8334	int rc2;
8335
8336	for(; zCopy[i]!='/' && i<nCopy; i++);
8337	if( i==nCopy ) break;
8338	zCopy[i] = '\0';
	@@ -8378,11 +8204,11 @@
8378	if( mkdir(zFile, mode) ){
8379	/* The mkdir() call to create the directory failed. This might not
8380	** be an error though - if there is already a directory at the same
8381	** path and either the permissions already match or can be changed
8382	** to do so using chmod(), it is not an error. */
8383	struct stat sStat;
8384	if( errno!=EEXIST
8385	\|\| 0!=fileStat(zFile, &sStat)
8386	\|\| !S_ISDIR(sStat.st_mode)
8387	\|\| ((sStat.st_mode&0777)!=(mode&0777) && 0!=chmod(zFile, mode&0777))
8388	){
	@@ -8574,17 +8400,18 @@
8574
8575	struct fsdir_cursor {
8576	sqlite3_vtab_cursor base; /* Base class - must be first */
8577
8578	int nLvl; /* Number of entries in aLvl[] array */

8579	int iLvl; /* Index of current entry */
8580	FsdirLevel aLvl; / Hierarchy of directories being traversed */
8581
8582	const char *zBase;
8583	int nBase;
8584
8585	struct stat sStat; /* Current lstat() results */
8586	char zPath; / Path to current entry */
8587	sqlite3_int64 iRowid; /* Current rowid */
8588	};
8589
8590	typedef struct fsdir_tab fsdir_tab;
	@@ -8692,11 +8519,11 @@
8692	static int fsdirNext(sqlite3_vtab_cursor *cur){
8693	fsdir_cursor pCur = (fsdir_cursor)cur;
8694	mode_t m = pCur->sStat.st_mode;
8695
8696	pCur->iRowid++;
8697	if( S_ISDIR(m) ){
8698	/* Descend into this directory */
8699	int iNew = pCur->iLvl + 1;
8700	FsdirLevel *pLvl;
8701	if( iNew>=pCur->nLvl ){
8702	int nNew = iNew+1;
	@@ -8800,11 +8627,15 @@
8800	if( aBuf!=aStatic ) sqlite3_free(aBuf);
8801	#endif
8802	}else{
8803	readFileContents(ctx, pCur->zPath);
8804	}

8805	}



8806	case FSDIR_COLUMN_PATH:
8807	default: {
8808	/* The FSDIR_COLUMN_PATH and FSDIR_COLUMN_DIR are input parameters.
8809	** always return their values as NULL */
8810	break;
	@@ -8834,36 +8665,50 @@
8834	}
8835
8836	/*
8837	** xFilter callback.
8838	**
8839	** idxNum==1 PATH parameter only
8840	** idxNum==2 Both PATH and DIR supplied



8841	*/
8842	static int fsdirFilter(
8843	sqlite3_vtab_cursor *cur,
8844	int idxNum, const char *idxStr,
8845	int argc, sqlite3_value **argv
8846	){
8847	const char *zDir = 0;
8848	fsdir_cursor pCur = (fsdir_cursor)cur;

8849	(void)idxStr;
8850	fsdirResetCursor(pCur);
8851
8852	if( idxNum==0 ){
8853	fsdirSetErrmsg(pCur, "table function fsdir requires an argument");
8854	return SQLITE_ERROR;
8855	}
8856
8857	assert( argc==idxNum && (argc==1 \|\| argc==2) );
8858	zDir = (const char*)sqlite3_value_text(argv[0]);
8859	if( zDir==0 ){
8860	fsdirSetErrmsg(pCur, "table function fsdir requires a non-NULL argument");
8861	return SQLITE_ERROR;
8862	}
8863	if( argc==2 ){
8864	pCur->zBase = (const char*)sqlite3_value_text(argv[1]);










8865	}
8866	if( pCur->zBase ){
8867	pCur->nBase = (int)strlen(pCur->zBase)+1;
8868	pCur->zPath = sqlite3_mprintf("%s/%s", pCur->zBase, zDir);
8869	}else{
	@@ -8888,48 +8733,75 @@
8888	** plan.
8889	**
8890	** In this implementation idxNum is used to represent the
8891	** query plan. idxStr is unused.
8892	**
8893	** The query plan is represented by values of idxNum:
8894	**
8895	** (1) The path value is supplied by argv[0]
8896	** (2) Path is in argv[0] and dir is in argv[1]

8897	*/
8898	static int fsdirBestIndex(
8899	sqlite3_vtab *tab,
8900	sqlite3_index_info *pIdxInfo
8901	){
8902	int i; /* Loop over constraints */
8903	int idxPath = -1; /* Index in pIdxInfo->aConstraint of PATH= */
8904	int idxDir = -1; /* Index in pIdxInfo->aConstraint of DIR= */



8905	int seenPath = 0; /* True if an unusable PATH= constraint is seen */
8906	int seenDir = 0; /* True if an unusable DIR= constraint is seen */
8907	const struct sqlite3_index_constraint *pConstraint;
8908
8909	(void)tab;
8910	pConstraint = pIdxInfo->aConstraint;
8911	for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
8912	if( pConstraint->op!=SQLITE_INDEX_CONSTRAINT_EQ ) continue;
8913	switch( pConstraint->iColumn ){
8914	case FSDIR_COLUMN_PATH: {
8915	if( pConstraint->usable ){
8916	idxPath = i;
8917	seenPath = 0;
8918	}else if( idxPath<0 ){
8919	seenPath = 1;
8920	}
8921	break;
8922	}
8923	case FSDIR_COLUMN_DIR: {
8924	if( pConstraint->usable ){
8925	idxDir = i;
8926	seenDir = 0;
8927	}else if( idxDir<0 ){
8928	seenDir = 1;
8929	}
8930	break;























8931	}
8932	}
8933	}
8934	if( seenPath \|\| seenDir ){
8935	/* If input parameters are unusable, disallow this plan */
	@@ -8942,18 +8814,24 @@
8942	** number. Leave it unchanged. */
8943	pIdxInfo->estimatedRows = 0x7fffffff;
8944	}else{
8945	pIdxInfo->aConstraintUsage[idxPath].omit = 1;
8946	pIdxInfo->aConstraintUsage[idxPath].argvIndex = 1;



8947	if( idxDir>=0 ){
8948	pIdxInfo->aConstraintUsage[idxDir].omit = 1;
8949	pIdxInfo->aConstraintUsage[idxDir].argvIndex = 2;
8950	pIdxInfo->idxNum = 2;
8951	pIdxInfo->estimatedCost = 10.0;
8952	}else{
8953	pIdxInfo->idxNum = 1;
8954	pIdxInfo->estimatedCost = 100.0;



8955	}
8956	}
8957
8958	return SQLITE_OK;
8959	}
	@@ -16808,11 +16686,11 @@
16808	case SQLITE_FCNTL_POWERSAFE_OVERWRITE: zOp = "POWERSAFE_OVERWRITE"; break;
16809	case SQLITE_FCNTL_PRAGMA: {
16810	const char const a = (const charconst)pArg;
16811	if( a[1] && strcmp(a[1],"vfstrace")==0 && a[2] ){
16812	const u8 zArg = (const u8)a[2];
16813	if( zArg[0]>='0' && zArg[0]<=9 ){
16814	pInfo->mTrace = (sqlite3_uint64)strtoll(a[2], 0, 0);
16815	}else{
16816	static const struct {
16817	const char *z;
16818	unsigned int m;
	@@ -18709,10 +18587,13 @@
18709	rc = sqlite3_create_module(db, "sqlite_dbptr", &dbdata_module, (void*)1);
18710	}
18711	return rc;
18712	}
18713



18714	int sqlite3_dbdata_init(
18715	sqlite3 *db,
18716	char **pzErrMsg,
18717	const sqlite3_api_routines *pApi
18718	){
	@@ -25592,107 +25473,108 @@
25592	" --plain Show results as text/plain, not as HTML",
25593	#endif
25594	};
25595
25596	/*
25597	** Output help text.















25598	**
25599	** zPattern describes the set of commands for which help text is provided.
25600	** If zPattern is NULL, then show all commands, but only give a one-line
25601	** description of each.
25602	**
25603	** Return the number of matches.
25604	*/
25605	static int showHelp(FILE out, const char zPattern){
25606	int i = 0;
25607	int j = 0;
25608	int n = 0;
25609	char *zPat;
25610	if( zPattern==0
25611	\|\| zPattern[0]=='0'
25612	\|\| cli_strcmp(zPattern,"-a")==0
25613	\|\| cli_strcmp(zPattern,"-all")==0
25614	\|\| cli_strcmp(zPattern,"--all")==0
25615	){
25616	enum HelpWanted { HW_NoCull = 0, HW_SummaryOnly = 1, HW_Undoc = 2 };
25617	enum HelpHave { HH_Undoc = 2, HH_Summary = 1, HH_More = 0 };
25618	/* Show all or most commands
25619	** *zPattern==0 => summary of documented commands only
25620	** *zPattern=='0' => whole help for undocumented commands
25621	** Otherwise => whole help for documented commands
25622	*/
25623	enum HelpWanted hw = HW_SummaryOnly;
25624	enum HelpHave hh = HH_More;
25625	if( zPattern!=0 ){
25626	hw = (*zPattern=='0')? HW_NoCull\|HW_Undoc : HW_NoCull;
25627	}
25628	for(i=0; i<ArraySize(azHelp); i++){
25629	switch( azHelp[i][0] ){
25630	case ',':
25631	hh = HH_Summary\|HH_Undoc;
25632	break;
25633	case '.':
25634	hh = HH_Summary;
25635	break;
25636	default:
25637	hh &= ~HH_Summary;
25638	break;
25639	}
25640	if( ((hw^hh)&HH_Undoc)==0 ){
25641	if( (hh&HH_Summary)!=0 ){
25642	sqlite3_fprintf(out, ".%s\n", azHelp[i]+1);
25643	++n;
25644	}else if( (hw&HW_SummaryOnly)==0 ){
25645	sqlite3_fprintf(out, "%s\n", azHelp[i]);
25646	}
25647	}
25648	}
25649	}else{
25650	/* Seek documented commands for which zPattern is an exact prefix */
25651	zPat = sqlite3_mprintf(".%s*", zPattern);
25652	shell_check_oom(zPat);
25653	for(i=0; i<ArraySize(azHelp); i++){
25654	if( sqlite3_strglob(zPat, azHelp[i])==0 ){
25655	sqlite3_fprintf(out, "%s\n", azHelp[i]);
25656	j = i+1;
25657	n++;
25658	}
25659	}
25660	sqlite3_free(zPat);
25661	if( n ){
25662	if( n==1 ){
25663	/* when zPattern is a prefix of exactly one command, then include
25664	** the details of that command, which should begin at offset j */
25665	while( j<ArraySize(azHelp)-1 && azHelp[j][0]==' ' ){
25666	sqlite3_fprintf(out, "%s\n", azHelp[j]);
25667	j++;
25668	}
25669	}
25670	return n;
25671	}
25672	/* Look for documented commands that contain zPattern anywhere.
25673	** Show complete text of all documented commands that match. */
25674	zPat = sqlite3_mprintf("%%%s%%", zPattern);
25675	shell_check_oom(zPat);
25676	for(i=0; i<ArraySize(azHelp); i++){
25677	if( azHelp[i][0]==',' ){
25678	while( i<ArraySize(azHelp)-1 && azHelp[i+1][0]==' ' ) ++i;
25679	continue;
25680	}
25681	if( azHelp[i][0]=='.' ) j = i;
25682	if( sqlite3_strlike(zPat, azHelp[i], 0)==0 ){
25683	sqlite3_fprintf(out, "%s\n", azHelp[j]);
25684	while( j<ArraySize(azHelp)-1 && azHelp[j+1][0]==' ' ){
25685	j++;
25686	sqlite3_fprintf(out, "%s\n", azHelp[j]);
25687	}
25688	i = j;
25689	n++;
25690	}
25691	}
25692	sqlite3_free(zPat);
25693	}
25694	return n;
25695	}
25696
25697	/* Forward reference */
25698	static int process_input(ShellState *p);
	@@ -25937,10 +25819,43 @@
25937	int sleep = sqlite3_value_int(argv[0]);
25938	(void)argcUnused;
25939	sqlite3_sleep(sleep/1000);
25940	sqlite3_result_int(context, sleep);
25941	}

































25942
25943	/* Flags for open_db().
25944	**
25945	** The default behavior of open_db() is to exit(1) if the database fails to
25946	** open. The OPEN_DB_KEEPALIVE flag changes that so that it prints an error
	@@ -26081,11 +25996,11 @@
26081	shellDtostr, 0, 0);
26082	sqlite3_create_function(p->db, "dtostr", 2, SQLITE_UTF8, 0,
26083	shellDtostr, 0, 0);
26084	sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
26085	shellAddSchemaName, 0, 0);
26086	sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
26087	shellModuleSchema, 0, 0);
26088	sqlite3_create_function(p->db, "shell_putsnl", 1, SQLITE_UTF8, p,
26089	shellPutsFunc, 0, 0);
26090	sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
26091	shellUSleepFunc, 0, 0);
	@@ -29541,11 +29456,12 @@
29541	rc = sqlite3_exec(p->db,
29542	"SELECT sql FROM"
29543	" (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
29544	" FROM sqlite_schema UNION ALL"
29545	" SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_schema) "
29546	"WHERE type!='meta' AND sql NOTNULL AND name NOT LIKE 'sqlite_%' "

29547	"ORDER BY x",
29548	callback, &data, 0
29549	);
29550	if( rc==SQLITE_OK ){
29551	sqlite3_stmt *pStmt;
	@@ -31017,11 +30933,11 @@
31017	}
31018	appendText(&sSelect, " AND ", 0);
31019	sqlite3_free(zQarg);
31020	}
31021	if( bNoSystemTabs ){
31022	appendText(&sSelect, "name NOT LIKE 'sqlite_%%' AND ", 0);
31023	}
31024	appendText(&sSelect, "sql IS NOT NULL"
31025	" ORDER BY snum, rowid", 0);
31026	if( bDebug ){
31027	sqlite3_fprintf(p->out, "SQL: %s;\n", sSelect.z);
	@@ -31448,11 +31364,11 @@
31448	" UNION ALL SELECT 'sqlite_schema'"
31449	" ORDER BY 1 collate nocase";
31450	}else{
31451	zSql = "SELECT lower(name) as tname FROM sqlite_schema"
31452	" WHERE type='table' AND coalesce(rootpage,0)>1"
31453	" AND name NOT LIKE 'sqlite_%'"
31454	" ORDER BY 1 collate nocase";
31455	}
31456	sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
31457	initText(&sQuery);
31458	initText(&sSql);
	@@ -31513,11 +31429,11 @@
31513	{
31514	int lrc;
31515	char zRevText = / Query for reversible to-blob-to-text check */
31516	"SELECT lower(name) as tname FROM sqlite_schema\n"
31517	"WHERE type='table' AND coalesce(rootpage,0)>1\n"
31518	"AND name NOT LIKE 'sqlite_%%'%s\n"
31519	"ORDER BY 1 collate nocase";
31520	zRevText = sqlite3_mprintf(zRevText, zLike? " AND name LIKE $tspec" : "");
31521	zRevText = sqlite3_mprintf(
31522	/* lower-case query is first run, producing upper-case query. */
31523	"with tabcols as materialized(\n"
	@@ -31709,11 +31625,11 @@
31709	}
31710	appendText(&s, zDbName, '"');
31711	appendText(&s, ".sqlite_schema ", 0);
31712	if( c=='t' ){
31713	appendText(&s," WHERE type IN ('table','view')"
31714	" AND name NOT LIKE 'sqlite_%'"
31715	" AND name LIKE ?1", 0);
31716	}else{
31717	appendText(&s," WHERE type='index'"
31718	" AND tbl_name LIKE ?1", 0);
31719	}
	@@ -31803,11 +31719,11 @@
31803	const char zUsage; / Usage notes */
31804	} aCtrl[] = {
31805	{"always", SQLITE_TESTCTRL_ALWAYS, 1, "BOOLEAN" },
31806	{"assert", SQLITE_TESTCTRL_ASSERT, 1, "BOOLEAN" },
31807	/{"benign_malloc_hooks",SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS,1, "" },/
31808	/{"bitvec_test", SQLITE_TESTCTRL_BITVEC_TEST, 1, "" },/
31809	{"byteorder", SQLITE_TESTCTRL_BYTEORDER, 0, "" },
31810	{"extra_schema_checks",SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS,0,"BOOLEAN" },
31811	{"fault_install", SQLITE_TESTCTRL_FAULT_INSTALL, 1,"args..." },
31812	{"fk_no_action", SQLITE_TESTCTRL_FK_NO_ACTION, 0, "BOOLEAN" },
31813	{"imposter", SQLITE_TESTCTRL_IMPOSTER,1,"SCHEMA ON/OFF ROOTPAGE"},
	@@ -31922,10 +31838,11 @@
31922	{ 0x02000000, 1, "Coroutines" },
31923	{ 0x04000000, 1, "NullUnusedCols" },
31924	{ 0x08000000, 1, "OnePass" },
31925	{ 0x10000000, 1, "OrderBySubq" },
31926	{ 0x20000000, 1, "StarQuery" },

31927	{ 0xffffffff, 0, "All" },
31928	};
31929	unsigned int curOpt;
31930	unsigned int newOpt;
31931	unsigned int m;
	@@ -32141,10 +32058,53 @@
32141	rc2 = booleanValue(azArg[2]);
32142	isOk = 3;
32143	}
32144	sqlite3_test_control(testctrl, &rc2);
32145	break;











































32146	case SQLITE_TESTCTRL_FAULT_INSTALL: {
32147	int kk;
32148	int bShowHelp = nArg<=2;
32149	isOk = 3;
32150	for(kk=2; kk<nArg; kk++){
32151

	--- extsrc/shell.c
	+++ extsrc/shell.c
	@@ -1266,16 +1266,25 @@
1266	return 0x3fffffff & (int)(z2 - z);
1267	}
1268
1269	/*
1270	** Return the length of a string in characters. Multibyte UTF8 characters
1271	** count as a single character for single-width characters, or as two
1272	** characters for double-width characters.
1273	*/
1274	static int strlenChar(const char *z){
1275	int n = 0;
1276	while( *z ){
1277	if( (0x80&z[0])==0 ){
1278	n++;
1279	z++;
1280	}else{
1281	int u = 0;
1282	int len = decodeUtf8((const u8*)z, &u);
1283	z += len;
1284	n += cli_wcwidth(u);
1285	}
1286	}
1287	return n;
1288	}
1289
1290	/*
	@@ -1622,34 +1631,10 @@
1631	if( n>350 ) n = 350;
1632	sqlite3_snprintf(sizeof(z), z, "%#+.*e", n, r);
1633	sqlite3_result_text(pCtx, z, -1, SQLITE_TRANSIENT);
1634	}
1635
























1636	/*
1637	** SQL function: shell_add_schema(S,X)
1638	**
1639	** Add the schema name X to the CREATE statement in S and return the result.
1640	** Examples:
	@@ -1728,369 +1713,176 @@
1713	** work here in the middle of this regular program.
1714	*/
1715	#define SQLITE_EXTENSION_INIT1
1716	#define SQLITE_EXTENSION_INIT2(X) (void)(X)
1717
1718	/*********************** Begin ../ext/misc/windirent.h ****************/

1719	/*
1720	** 2025-06-05
1721	**
1722	** The author disclaims copyright to this source code. In place of
1723	** a legal notice, here is a blessing:
1724	**
1725	** May you do good and not evil.
1726	** May you find forgiveness for yourself and forgive others.
1727	** May you share freely, never taking more than you give.
1728	**
1729	*************************************************************************
1730	**
1731	** An implementation of opendir(), readdir(), and closedir() for Windows,
1732	** based on the FindFirstFile(), FindNextFile(), and FindClose() APIs
1733	** of Win32.
1734	**
1735	** #include this file inside any C-code module that needs to use
1736	** opendir()/readdir()/closedir(). This file is a no-op on non-Windows
1737	** machines. On Windows, static functions are defined that implement
1738	** those standard interfaces.
1739	*/

1740	#if defined(_WIN32) && defined(_MSC_VER) && !defined(SQLITE_WINDIRENT_H)
1741	#define SQLITE_WINDIRENT_H
1742




1743	#ifndef WIN32_LEAN_AND_MEAN
1744	#define WIN32_LEAN_AND_MEAN
1745	#endif
1746	#include <windows.h>
1747	#include <io.h>











1748	#include <stdio.h>
1749	#include <stdlib.h>
1750	#include <errno.h>

1751	#include <limits.h>
1752	#include <sys/types.h>
1753	#include <sys/stat.h>
1754	#include <string.h>
1755	#ifndef FILENAME_MAX
1756	# define FILENAME_MAX (260)
1757	#endif
1758	#ifndef S_ISREG
1759	#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
1760	#endif
1761	#ifndef S_ISDIR
1762	#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
1763	#endif
1764	#ifndef S_ISLNK
1765	#define S_ISLNK(m) (0)
1766	#endif
1767	typedef unsigned short mode_t;
1768
1769	/* The dirent object for Windows is abbreviated. The only field really
1770	** usable by applications is d_name[].
1771	*/
1772	struct dirent {
1773	int d_ino; /* Inode number (synthesized) */
1774	unsigned d_attributes; /* File attributes */
1775	char d_name[FILENAME_MAX]; /* Null-terminated filename */
1776	};
1777
1778	/* The internals of DIR are opaque according to standards. So it
1779	** does not matter what we put here. */
1780	typedef struct DIR DIR;
1781	struct DIR {
1782	intptr_t d_handle; /* Handle for findfirst()/findnext() */
1783	struct dirent cur; /* Current entry */
1784	};
1785
1786	/* Ignore hidden and system files */
1787	#define WindowsFileToIgnore(a) \
1788	((((a).attrib)&_A_HIDDEN) \|\| (((a).attrib)&_A_SYSTEM))
1789
1790	/*
1791	** Close a previously opened directory
1792	*/
1793	static int closedir(DIR *pDir){
1794	int rc = 0;
1795	if( pDir==0 ){
1796	return EINVAL;
1797	}
1798	if( pDir->d_handle!=0 && pDir->d_handle!=(-1) ){
1799	rc = _findclose(pDir->d_handle);
1800	}
1801	sqlite3_free(pDir);
1802	return rc;
1803	}
1804
1805	/*
1806	** Open a new directory. The directory name should be UTF-8 encoded.
1807	** appropriate translations happen automatically.
1808	*/
1809	static DIR opendir(const char zDirName){
1810	DIR *pDir;
1811	wchar_t *b1;
1812	sqlite3_int64 sz;
1813	struct _wfinddata_t data;
1814
1815	pDir = sqlite3_malloc64( sizeof(DIR) );
1816	if( pDir==0 ) return 0;
1817	memset(pDir, 0, sizeof(DIR));
1818	memset(&data, 0, sizeof(data));
1819	sz = strlen(zDirName);
1820	b1 = sqlite3_malloc64( (sz+3)*sizeof(b1[0]) );
1821	if( b1==0 ){
1822	closedir(pDir);
1823	return NULL;
1824	}
1825	sz = MultiByteToWideChar(CP_UTF8, 0, zDirName, sz, b1, sz);
1826	b1[sz++] = '\\';
1827	b1[sz++] = '*';
1828	b1[sz] = 0;
1829	if( sz+1>sizeof(data.name)/sizeof(data.name[0]) ){
1830	closedir(pDir);
1831	sqlite3_free(b1);
1832	return NULL;
1833	}
1834	memcpy(data.name, b1, (sz+1)*sizeof(b1[0]));
1835	sqlite3_free(b1);
1836	pDir->d_handle = _wfindfirst(data.name, &data);
1837	if( pDir->d_handle<0 ){
1838	closedir(pDir);
1839	return NULL;
1840	}
1841	while( WindowsFileToIgnore(data) ){
1842	memset(&data, 0, sizeof(data));
1843	if( _wfindnext(pDir->d_handle, &data)==-1 ){
1844	closedir(pDir);
1845	return NULL;
1846	}
1847	}
1848	pDir->cur.d_ino = 0;
1849	pDir->cur.d_attributes = data.attrib;
1850	WideCharToMultiByte(CP_UTF8, 0, data.name, -1,
1851	pDir->cur.d_name, FILENAME_MAX, 0, 0);
1852	return pDir;
1853	}
1854
1855	/*
1856	** Read the next entry from a directory.
1857	**
1858	** The returned struct-dirent object is managed by DIR. It is only
1859	** valid until the next readdir() or closedir() call. Only the
1860	** d_name[] field is meaningful. The d_name[] value has been
1861	** translated into UTF8.
1862	*/
1863	static struct dirent readdir(DIR pDir){
1864	struct _wfinddata_t data;
1865	if( pDir==0 ) return 0;
1866	if( (pDir->cur.d_ino++)==0 ){
1867	return &pDir->cur;
1868	}
1869	do{
1870	memset(&data, 0, sizeof(data));
1871	if( _wfindnext(pDir->d_handle, &data)==-1 ){
1872	return NULL;
1873	}
1874	}while( WindowsFileToIgnore(data) );
1875	pDir->cur.d_attributes = data.attrib;
1876	WideCharToMultiByte(CP_UTF8, 0, data.name, -1,
1877	pDir->cur.d_name, FILENAME_MAX, 0, 0);
1878	return &pDir->cur;
1879	}
1880
1881	#endif /* defined(_WIN32) && defined(_MSC_VER) */
1882
1883	/*********************** End ../ext/misc/windirent.h ******************/






















































































































































































1884	/*********************** Begin ../ext/misc/memtrace.c ****************/
1885	/*
1886	** 2019-01-21
1887	**
1888	** The author disclaims copyright to this source code. In place of
	@@ -8054,10 +7846,11 @@
7846	** mode: Value of stat.st_mode for directory entry (an integer).
7847	** mtime: Value of stat.st_mtime for directory entry (an integer).
7848	** data: For a regular file, a blob containing the file data. For a
7849	** symlink, a text value containing the text of the link. For a
7850	** directory, NULL.
7851	** level: Directory hierarchy level. Topmost is 1.
7852	**
7853	** If a non-NULL value is specified for the optional $dir parameter and
7854	** $path is a relative path, then $path is interpreted relative to $dir.
7855	** And the paths returned in the "name" column of the table are also
7856	** relative to directory $dir.
	@@ -8079,24 +7872,17 @@
7872	#if !defined(_WIN32) && !defined(WIN32)
7873	# include <unistd.h>
7874	# include <dirent.h>
7875	# include <utime.h>
7876	# include <sys/time.h>
7877	# define STRUCT_STAT struct stat
7878	#else
7879	/* # include "windirent.h" */

7880	# include <direct.h>
7881	# define STRUCT_STAT struct _stat
7882	# define chmod(path,mode) fileio_chmod(path,mode)
7883	# define mkdir(path,mode) fileio_mkdir(path)







7884	#endif
7885	#include <time.h>
7886	#include <errno.h>
7887
7888	/* When used as part of the CLI, the sqlite3_stdio.h module will have
	@@ -8108,18 +7894,54 @@
7894	#endif
7895
7896	/*
7897	** Structure of the fsdir() table-valued function
7898	*/
7899	/* 0 1 2 3 4 5 6 */
7900	#define FSDIR_SCHEMA "(name,mode,mtime,data,level,path HIDDEN,dir HIDDEN)"
7901
7902	#define FSDIR_COLUMN_NAME 0 /* Name of the file */
7903	#define FSDIR_COLUMN_MODE 1 /* Access mode */
7904	#define FSDIR_COLUMN_MTIME 2 /* Last modification time */
7905	#define FSDIR_COLUMN_DATA 3 /* File content */
7906	#define FSDIR_COLUMN_LEVEL 4 /* Level. Topmost is 1 */
7907	#define FSDIR_COLUMN_PATH 5 /* Path to top of search */
7908	#define FSDIR_COLUMN_DIR 6 /* Path is relative to this directory */
7909
7910	/*
7911	** UTF8 chmod() function for Windows
7912	*/
7913	#if defined(_WIN32) \|\| defined(WIN32)
7914	static int fileio_chmod(const char *zPath, int pmode){
7915	sqlite3_int64 sz = strlen(zPath);
7916	wchar_t b1 = sqlite3_malloc64( (sz+1)sizeof(b1[0]) );
7917	int rc;
7918	if( b1==0 ) return -1;
7919	sz = MultiByteToWideChar(CP_UTF8, 0, zPath, sz, b1, sz);
7920	b1[sz] = 0;
7921	rc = _wchmod(b1, pmode);
7922	sqlite3_free(b1);
7923	return rc;
7924	}
7925	#endif
7926
7927	/*
7928	** UTF8 mkdir() function for Windows
7929	*/
7930	#if defined(_WIN32) \|\| defined(WIN32)
7931	static int fileio_mkdir(const char *zPath){
7932	sqlite3_int64 sz = strlen(zPath);
7933	wchar_t b1 = sqlite3_malloc64( (sz+1)sizeof(b1[0]) );
7934	int rc;
7935	if( b1==0 ) return -1;
7936	sz = MultiByteToWideChar(CP_UTF8, 0, zPath, sz, b1, sz);
7937	b1[sz] = 0;
7938	rc = _wmkdir(b1);
7939	sqlite3_free(b1);
7940	return rc;
7941	}
7942	#endif
7943
7944
7945	/*
7946	** Set the result stored by context ctx to a blob containing the
7947	** contents of file zName. Or, leave the result unchanged (NULL)
	@@ -8247,11 +8069,11 @@
8069	** buffer to UTC. This is necessary on Win32, where the runtime library
8070	** appears to return these values as local times.
8071	*/
8072	static void statTimesToUtc(
8073	const char *zPath,
8074	STRUCT_STAT *pStatBuf
8075	){
8076	HANDLE hFindFile;
8077	WIN32_FIND_DATAW fd;
8078	LPWSTR zUnicodeName;
8079	extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
	@@ -8275,14 +8097,20 @@
8097	** is required in order for the included time to be returned as UTC. On all
8098	** other systems, this function simply calls stat().
8099	*/
8100	static int fileStat(
8101	const char *zPath,
8102	STRUCT_STAT *pStatBuf
8103	){
8104	#if defined(_WIN32)
8105	sqlite3_int64 sz = strlen(zPath);
8106	wchar_t b1 = sqlite3_malloc64( (sz+1)sizeof(b1[0]) );
8107	int rc;
8108	if( b1==0 ) return 1;
8109	sz = MultiByteToWideChar(CP_UTF8, 0, zPath, sz, b1, sz);
8110	b1[sz] = 0;
8111	rc = _wstat(b1, pStatBuf);
8112	if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
8113	return rc;
8114	#else
8115	return stat(zPath, pStatBuf);
8116	#endif
	@@ -8293,16 +8121,14 @@
8121	** is required in order for the included time to be returned as UTC. On all
8122	** other systems, this function simply calls lstat().
8123	*/
8124	static int fileLinkStat(
8125	const char *zPath,
8126	STRUCT_STAT *pStatBuf
8127	){
8128	#if defined(_WIN32)
8129	return fileStat(zPath, pStatBuf);


8130	#else
8131	return lstat(zPath, pStatBuf);
8132	#endif
8133	}
8134
	@@ -8328,11 +8154,11 @@
8154	}else{
8155	int nCopy = (int)strlen(zCopy);
8156	int i = 1;
8157
8158	while( rc==SQLITE_OK ){
8159	STRUCT_STAT sStat;
8160	int rc2;
8161
8162	for(; zCopy[i]!='/' && i<nCopy; i++);
8163	if( i==nCopy ) break;
8164	zCopy[i] = '\0';
	@@ -8378,11 +8204,11 @@
8204	if( mkdir(zFile, mode) ){
8205	/* The mkdir() call to create the directory failed. This might not
8206	** be an error though - if there is already a directory at the same
8207	** path and either the permissions already match or can be changed
8208	** to do so using chmod(), it is not an error. */
8209	STRUCT_STAT sStat;
8210	if( errno!=EEXIST
8211	\|\| 0!=fileStat(zFile, &sStat)
8212	\|\| !S_ISDIR(sStat.st_mode)
8213	\|\| ((sStat.st_mode&0777)!=(mode&0777) && 0!=chmod(zFile, mode&0777))
8214	){
	@@ -8574,17 +8400,18 @@
8400
8401	struct fsdir_cursor {
8402	sqlite3_vtab_cursor base; /* Base class - must be first */
8403
8404	int nLvl; /* Number of entries in aLvl[] array */
8405	int mxLvl; /* Maximum level */
8406	int iLvl; /* Index of current entry */
8407	FsdirLevel aLvl; / Hierarchy of directories being traversed */
8408
8409	const char *zBase;
8410	int nBase;
8411
8412	STRUCT_STAT sStat; /* Current lstat() results */
8413	char zPath; / Path to current entry */
8414	sqlite3_int64 iRowid; /* Current rowid */
8415	};
8416
8417	typedef struct fsdir_tab fsdir_tab;
	@@ -8692,11 +8519,11 @@
8519	static int fsdirNext(sqlite3_vtab_cursor *cur){
8520	fsdir_cursor pCur = (fsdir_cursor)cur;
8521	mode_t m = pCur->sStat.st_mode;
8522
8523	pCur->iRowid++;
8524	if( S_ISDIR(m) && pCur->iLvl+3<pCur->mxLvl ){
8525	/* Descend into this directory */
8526	int iNew = pCur->iLvl + 1;
8527	FsdirLevel *pLvl;
8528	if( iNew>=pCur->nLvl ){
8529	int nNew = iNew+1;
	@@ -8800,11 +8627,15 @@
8627	if( aBuf!=aStatic ) sqlite3_free(aBuf);
8628	#endif
8629	}else{
8630	readFileContents(ctx, pCur->zPath);
8631	}
8632	break;
8633	}
8634	case FSDIR_COLUMN_LEVEL:
8635	sqlite3_result_int(ctx, pCur->iLvl+2);
8636	break;
8637	case FSDIR_COLUMN_PATH:
8638	default: {
8639	/* The FSDIR_COLUMN_PATH and FSDIR_COLUMN_DIR are input parameters.
8640	** always return their values as NULL */
8641	break;
	@@ -8834,36 +8665,50 @@
8665	}
8666
8667	/*
8668	** xFilter callback.
8669	**
8670	** idxNum bit Meaning
8671	** 0x01 PATH=N
8672	** 0x02 DIR=N
8673	** 0x04 LEVEL<N
8674	** 0x08 LEVEL<=N
8675	*/
8676	static int fsdirFilter(
8677	sqlite3_vtab_cursor *cur,
8678	int idxNum, const char *idxStr,
8679	int argc, sqlite3_value **argv
8680	){
8681	const char *zDir = 0;
8682	fsdir_cursor pCur = (fsdir_cursor)cur;
8683	int i;
8684	(void)idxStr;
8685	fsdirResetCursor(pCur);
8686
8687	if( idxNum==0 ){
8688	fsdirSetErrmsg(pCur, "table function fsdir requires an argument");
8689	return SQLITE_ERROR;
8690	}
8691
8692	assert( (idxNum & 0x01)!=0 && argc>0 );
8693	zDir = (const char*)sqlite3_value_text(argv[0]);
8694	if( zDir==0 ){
8695	fsdirSetErrmsg(pCur, "table function fsdir requires a non-NULL argument");
8696	return SQLITE_ERROR;
8697	}
8698	i = 1;
8699	if( (idxNum & 0x02)!=0 ){
8700	assert( argc>i );
8701	pCur->zBase = (const char*)sqlite3_value_text(argv[i++]);
8702	}
8703	if( (idxNum & 0x0c)!=0 ){
8704	assert( argc>i );
8705	pCur->mxLvl = sqlite3_value_int(argv[i++]);
8706	if( idxNum & 0x08 ) pCur->mxLvl++;
8707	if( pCur->mxLvl<=0 ) pCur->mxLvl = 1000000000;
8708	}else{
8709	pCur->mxLvl = 1000000000;
8710	}
8711	if( pCur->zBase ){
8712	pCur->nBase = (int)strlen(pCur->zBase)+1;
8713	pCur->zPath = sqlite3_mprintf("%s/%s", pCur->zBase, zDir);
8714	}else{
	@@ -8888,48 +8733,75 @@
8733	** plan.
8734	**
8735	** In this implementation idxNum is used to represent the
8736	** query plan. idxStr is unused.
8737	**
8738	** The query plan is represented by bits in idxNum:
8739	**
8740	** 0x01 The path value is supplied by argv[0]
8741	** 0x02 dir is in argv[1]
8742	** 0x04 maxdepth is in argv[1] or [2]
8743	*/
8744	static int fsdirBestIndex(
8745	sqlite3_vtab *tab,
8746	sqlite3_index_info *pIdxInfo
8747	){
8748	int i; /* Loop over constraints */
8749	int idxPath = -1; /* Index in pIdxInfo->aConstraint of PATH= */
8750	int idxDir = -1; /* Index in pIdxInfo->aConstraint of DIR= */
8751	int idxLevel = -1; /* Index in pIdxInfo->aConstraint of LEVEL< or <= */
8752	int idxLevelEQ = 0; /* 0x08 for LEVEL<= or LEVEL=. 0x04 for LEVEL< */
8753	int omitLevel = 0; /* omit the LEVEL constraint */
8754	int seenPath = 0; /* True if an unusable PATH= constraint is seen */
8755	int seenDir = 0; /* True if an unusable DIR= constraint is seen */
8756	const struct sqlite3_index_constraint *pConstraint;
8757
8758	(void)tab;
8759	pConstraint = pIdxInfo->aConstraint;
8760	for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
8761	if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
8762	switch( pConstraint->iColumn ){
8763	case FSDIR_COLUMN_PATH: {
8764	if( pConstraint->usable ){
8765	idxPath = i;
8766	seenPath = 0;
8767	}else if( idxPath<0 ){
8768	seenPath = 1;
8769	}
8770	break;
8771	}
8772	case FSDIR_COLUMN_DIR: {
8773	if( pConstraint->usable ){
8774	idxDir = i;
8775	seenDir = 0;
8776	}else if( idxDir<0 ){
8777	seenDir = 1;
8778	}
8779	break;
8780	}
8781	case FSDIR_COLUMN_LEVEL: {
8782	if( pConstraint->usable && idxLevel<0 ){
8783	idxLevel = i;
8784	idxLevelEQ = 0x08;
8785	omitLevel = 0;
8786	}
8787	break;
8788	}
8789	}
8790	}else
8791	if( pConstraint->iColumn==FSDIR_COLUMN_LEVEL
8792	&& pConstraint->usable
8793	&& idxLevel<0
8794	){
8795	if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_LE ){
8796	idxLevel = i;
8797	idxLevelEQ = 0x08;
8798	omitLevel = 1;
8799	}else if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_LT ){
8800	idxLevel = i;
8801	idxLevelEQ = 0x04;
8802	omitLevel = 1;
8803	}
8804	}
8805	}
8806	if( seenPath \|\| seenDir ){
8807	/* If input parameters are unusable, disallow this plan */
	@@ -8942,18 +8814,24 @@
8814	** number. Leave it unchanged. */
8815	pIdxInfo->estimatedRows = 0x7fffffff;
8816	}else{
8817	pIdxInfo->aConstraintUsage[idxPath].omit = 1;
8818	pIdxInfo->aConstraintUsage[idxPath].argvIndex = 1;
8819	pIdxInfo->idxNum = 0x01;
8820	pIdxInfo->estimatedCost = 1.0e9;
8821	i = 2;
8822	if( idxDir>=0 ){
8823	pIdxInfo->aConstraintUsage[idxDir].omit = 1;
8824	pIdxInfo->aConstraintUsage[idxDir].argvIndex = i++;
8825	pIdxInfo->idxNum \|= 0x02;
8826	pIdxInfo->estimatedCost /= 1.0e4;
8827	}
8828	if( idxLevel>=0 ){
8829	pIdxInfo->aConstraintUsage[idxLevel].omit = omitLevel;
8830	pIdxInfo->aConstraintUsage[idxLevel].argvIndex = i++;
8831	pIdxInfo->idxNum \|= idxLevelEQ;
8832	pIdxInfo->estimatedCost /= 1.0e4;
8833	}
8834	}
8835
8836	return SQLITE_OK;
8837	}
	@@ -16808,11 +16686,11 @@
16686	case SQLITE_FCNTL_POWERSAFE_OVERWRITE: zOp = "POWERSAFE_OVERWRITE"; break;
16687	case SQLITE_FCNTL_PRAGMA: {
16688	const char const a = (const charconst)pArg;
16689	if( a[1] && strcmp(a[1],"vfstrace")==0 && a[2] ){
16690	const u8 zArg = (const u8)a[2];
16691	if( zArg[0]>='0' && zArg[0]<='9' ){
16692	pInfo->mTrace = (sqlite3_uint64)strtoll(a[2], 0, 0);
16693	}else{
16694	static const struct {
16695	const char *z;
16696	unsigned int m;
	@@ -18709,10 +18587,13 @@
18587	rc = sqlite3_create_module(db, "sqlite_dbptr", &dbdata_module, (void*)1);
18588	}
18589	return rc;
18590	}
18591
18592	#ifdef _WIN32
18593
18594	#endif
18595	int sqlite3_dbdata_init(
18596	sqlite3 *db,
18597	char **pzErrMsg,
18598	const sqlite3_api_routines *pApi
18599	){
	@@ -25592,107 +25473,108 @@
25473	" --plain Show results as text/plain, not as HTML",
25474	#endif
25475	};
25476
25477	/*
25478	** Output help text for commands that match zPattern.
25479	**
25480	** * If zPattern is NULL, then show all documented commands, but
25481	** only give a one-line summary of each.
25482	**
25483	** * If zPattern is "-a" or "-all" or "--all" then show all help text
25484	** for all commands except undocumented commands.
25485	**
25486	** * If zPattern is "0" then show all help for undocumented commands.
25487	** Undocumented commands begin with "," instead of "." in the azHelp[]
25488	** array.
25489	**
25490	** * If zPattern is a prefix for one or more documented commands, then
25491	** show help for those commands. If only a single command matches the
25492	** prefix, show the full text of the help. If multiple commands match,
25493	** Only show just the first line of each.
25494	**
25495	** * Otherwise, show the complete text of any documented command for which
25496	** zPattern is a LIKE match for any text within that command help
25497	** text.
25498	**
25499	** Return the number commands that match zPattern.
25500	*/
25501	static int showHelp(FILE out, const char zPattern){
25502	int i = 0;
25503	int j = 0;
25504	int n = 0;
25505	char *zPat;
25506	if( zPattern==0 ){
25507	/* Show just the first line for all help topics */
25508	zPattern = "[a-z]";
25509	}else if( cli_strcmp(zPattern,"-a")==0
25510	\|\| cli_strcmp(zPattern,"-all")==0
25511	\|\| cli_strcmp(zPattern,"--all")==0
25512	){
25513	/* Show everything except undocumented commands */
25514	zPattern = ".";
25515	}else if( cli_strcmp(zPattern,"0")==0 ){
25516	/* Show complete help text of undocumented commands */
25517	int show = 0;
25518	for(i=0; i<ArraySize(azHelp); i++){
25519	if( azHelp[i][0]=='.' ){
25520	show = 0;
25521	}else if( azHelp[i][0]==',' ){
25522	show = 1;
25523	sqlite3_fprintf(out, ".%s\n", &azHelp[i][1]);
25524	n++;
25525	}else if( show ){
25526	sqlite3_fprintf(out, "%s\n", azHelp[i]);
25527	}
25528	}
25529	return n;
25530	}
25531
25532	/* Seek documented commands for which zPattern is an exact prefix */
25533	zPat = sqlite3_mprintf(".%s*", zPattern);
25534	shell_check_oom(zPat);
25535	for(i=0; i<ArraySize(azHelp); i++){
25536	if( sqlite3_strglob(zPat, azHelp[i])==0 ){
25537	sqlite3_fprintf(out, "%s\n", azHelp[i]);
25538	j = i+1;
25539	n++;
25540	}
25541	}
25542	sqlite3_free(zPat);
25543	if( n ){
25544	if( n==1 ){
25545	/* when zPattern is a prefix of exactly one command, then include
25546	** the details of that command, which should begin at offset j */
25547	while( j<ArraySize(azHelp)-1 && azHelp[j][0]==' ' ){
25548	sqlite3_fprintf(out, "%s\n", azHelp[j]);
25549	j++;
25550	}
25551	}
25552	return n;
25553	}
25554
25555	/* Look for documented commands that contain zPattern anywhere.
25556	** Show complete text of all documented commands that match. */
25557	zPat = sqlite3_mprintf("%%%s%%", zPattern);
25558	shell_check_oom(zPat);
25559	for(i=0; i<ArraySize(azHelp); i++){
25560	if( azHelp[i][0]==',' ){
25561	while( i<ArraySize(azHelp)-1 && azHelp[i+1][0]==' ' ) ++i;
25562	continue;
25563	}
25564	if( azHelp[i][0]=='.' ) j = i;
25565	if( sqlite3_strlike(zPat, azHelp[i], 0)==0 ){
25566	sqlite3_fprintf(out, "%s\n", azHelp[j]);
25567	while( j<ArraySize(azHelp)-1 && azHelp[j+1][0]==' ' ){
25568	j++;
25569	sqlite3_fprintf(out, "%s\n", azHelp[j]);
25570	}
25571	i = j;
25572	n++;
25573	}
25574	}
25575	sqlite3_free(zPat);














25576	return n;
25577	}
25578
25579	/* Forward reference */
25580	static int process_input(ShellState *p);
	@@ -25937,10 +25819,43 @@
25819	int sleep = sqlite3_value_int(argv[0]);
25820	(void)argcUnused;
25821	sqlite3_sleep(sleep/1000);
25822	sqlite3_result_int(context, sleep);
25823	}
25824
25825	/*
25826	** SQL function: shell_module_schema(X)
25827	**
25828	** Return a fake schema for the table-valued function or eponymous virtual
25829	** table X.
25830	*/
25831	static void shellModuleSchema(
25832	sqlite3_context *pCtx,
25833	int nVal,
25834	sqlite3_value **apVal
25835	){
25836	const char *zName;
25837	char *zFake;
25838	ShellState p = (ShellState)sqlite3_user_data(pCtx);
25839	FILE *pSavedLog = p->pLog;
25840	UNUSED_PARAMETER(nVal);
25841	zName = (const char*)sqlite3_value_text(apVal[0]);
25842
25843	/* Temporarily disable the ".log" when calling shellFakeSchema() because
25844	** shellFakeSchema() might generate failures for some ephemeral virtual
25845	** tables due to missing arguments. Example: fts4aux.
25846	** https://sqlite.org/forum/forumpost/42fe6520b803be51 */
25847	p->pLog = 0;
25848	zFake = zName? shellFakeSchema(sqlite3_context_db_handle(pCtx), 0, zName) : 0;
25849	p->pLog = pSavedLog;
25850
25851	if( zFake ){
25852	sqlite3_result_text(pCtx, sqlite3_mprintf("/* %s */", zFake),
25853	-1, sqlite3_free);
25854	free(zFake);
25855	}
25856	}
25857
25858	/* Flags for open_db().
25859	**
25860	** The default behavior of open_db() is to exit(1) if the database fails to
25861	** open. The OPEN_DB_KEEPALIVE flag changes that so that it prints an error
	@@ -26081,11 +25996,11 @@
25996	shellDtostr, 0, 0);
25997	sqlite3_create_function(p->db, "dtostr", 2, SQLITE_UTF8, 0,
25998	shellDtostr, 0, 0);
25999	sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
26000	shellAddSchemaName, 0, 0);
26001	sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, p,
26002	shellModuleSchema, 0, 0);
26003	sqlite3_create_function(p->db, "shell_putsnl", 1, SQLITE_UTF8, p,
26004	shellPutsFunc, 0, 0);
26005	sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
26006	shellUSleepFunc, 0, 0);
	@@ -29541,11 +29456,12 @@
29456	rc = sqlite3_exec(p->db,
29457	"SELECT sql FROM"
29458	" (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
29459	" FROM sqlite_schema UNION ALL"
29460	" SELECT sql, type, tbl_name, name, rowid FROM sqlite_temp_schema) "
29461	"WHERE type!='meta' AND sql NOTNULL"
29462	" AND name NOT LIKE 'sqlite__%' ESCAPE '_' "
29463	"ORDER BY x",
29464	callback, &data, 0
29465	);
29466	if( rc==SQLITE_OK ){
29467	sqlite3_stmt *pStmt;
	@@ -31017,11 +30933,11 @@
30933	}
30934	appendText(&sSelect, " AND ", 0);
30935	sqlite3_free(zQarg);
30936	}
30937	if( bNoSystemTabs ){
30938	appendText(&sSelect, "name NOT LIKE 'sqlite__%%' ESCAPE '_' AND ", 0);
30939	}
30940	appendText(&sSelect, "sql IS NOT NULL"
30941	" ORDER BY snum, rowid", 0);
30942	if( bDebug ){
30943	sqlite3_fprintf(p->out, "SQL: %s;\n", sSelect.z);
	@@ -31448,11 +31364,11 @@
31364	" UNION ALL SELECT 'sqlite_schema'"
31365	" ORDER BY 1 collate nocase";
31366	}else{
31367	zSql = "SELECT lower(name) as tname FROM sqlite_schema"
31368	" WHERE type='table' AND coalesce(rootpage,0)>1"
31369	" AND name NOT LIKE 'sqlite__%' ESCAPE '_'"
31370	" ORDER BY 1 collate nocase";
31371	}
31372	sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
31373	initText(&sQuery);
31374	initText(&sSql);
	@@ -31513,11 +31429,11 @@
31429	{
31430	int lrc;
31431	char zRevText = / Query for reversible to-blob-to-text check */
31432	"SELECT lower(name) as tname FROM sqlite_schema\n"
31433	"WHERE type='table' AND coalesce(rootpage,0)>1\n"
31434	"AND name NOT LIKE 'sqlite__%%' ESCAPE '_'%s\n"
31435	"ORDER BY 1 collate nocase";
31436	zRevText = sqlite3_mprintf(zRevText, zLike? " AND name LIKE $tspec" : "");
31437	zRevText = sqlite3_mprintf(
31438	/* lower-case query is first run, producing upper-case query. */
31439	"with tabcols as materialized(\n"
	@@ -31709,11 +31625,11 @@
31625	}
31626	appendText(&s, zDbName, '"');
31627	appendText(&s, ".sqlite_schema ", 0);
31628	if( c=='t' ){
31629	appendText(&s," WHERE type IN ('table','view')"
31630	" AND name NOT LIKE 'sqlite__%' ESCAPE '_'"
31631	" AND name LIKE ?1", 0);
31632	}else{
31633	appendText(&s," WHERE type='index'"
31634	" AND tbl_name LIKE ?1", 0);
31635	}
	@@ -31803,11 +31719,11 @@
31719	const char zUsage; / Usage notes */
31720	} aCtrl[] = {
31721	{"always", SQLITE_TESTCTRL_ALWAYS, 1, "BOOLEAN" },
31722	{"assert", SQLITE_TESTCTRL_ASSERT, 1, "BOOLEAN" },
31723	/{"benign_malloc_hooks",SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS,1, "" },/
31724	{"bitvec_test", SQLITE_TESTCTRL_BITVEC_TEST, 1, "SIZE INT-ARRAY"},
31725	{"byteorder", SQLITE_TESTCTRL_BYTEORDER, 0, "" },
31726	{"extra_schema_checks",SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS,0,"BOOLEAN" },
31727	{"fault_install", SQLITE_TESTCTRL_FAULT_INSTALL, 1,"args..." },
31728	{"fk_no_action", SQLITE_TESTCTRL_FK_NO_ACTION, 0, "BOOLEAN" },
31729	{"imposter", SQLITE_TESTCTRL_IMPOSTER,1,"SCHEMA ON/OFF ROOTPAGE"},
	@@ -31922,10 +31838,11 @@
31838	{ 0x02000000, 1, "Coroutines" },
31839	{ 0x04000000, 1, "NullUnusedCols" },
31840	{ 0x08000000, 1, "OnePass" },
31841	{ 0x10000000, 1, "OrderBySubq" },
31842	{ 0x20000000, 1, "StarQuery" },
31843	{ 0x40000000, 1, "ExistsToJoin" },
31844	{ 0xffffffff, 0, "All" },
31845	};
31846	unsigned int curOpt;
31847	unsigned int newOpt;
31848	unsigned int m;
	@@ -32141,10 +32058,53 @@
32058	rc2 = booleanValue(azArg[2]);
32059	isOk = 3;
32060	}
32061	sqlite3_test_control(testctrl, &rc2);
32062	break;
32063	case SQLITE_TESTCTRL_BITVEC_TEST: {
32064	/* Examples:
32065	** .testctrl bitvec_test 100 6,1 -- Show BITVEC constants
32066	** .testctrl bitvec_test 1000 1,12,7,3 -- Simple test
32067	** ---- --------
32068	** size of Bitvec -----^ ^--- aOp array. 0 added at end.
32069	**
32070	** See comments on sqlite3BitvecBuiltinTest() for more information
32071	** about the aOp[] array.
32072	*/
32073	int iSize;
32074	const char *zTestArg;
32075	int nOp;
32076	int ii, jj, x;
32077	int *aOp;
32078	if( nArg!=4 ){
32079	sqlite3_fprintf(stderr,
32080	"ERROR - should be: \".testctrl bitvec_test SIZE INT-ARRAY\"\n"
32081	);
32082	rc = 1;
32083	goto meta_command_exit;
32084	}
32085	isOk = 3;
32086	iSize = (int)integerValue(azArg[2]);
32087	zTestArg = azArg[3];
32088	nOp = (int)strlen(zTestArg)+1;
32089	aOp = malloc( sizeof(int)*(nOp+1) );
32090	shell_check_oom(aOp);
32091	memset(aOp, 0, sizeof(int)*(nOp+1) );
32092	for(ii = jj = x = 0; zTestArg[ii]!=0; ii++){
32093	if( IsDigit(zTestArg[ii]) ){
32094	x = x*10 + zTestArg[ii] - '0';
32095	}else{
32096	aOp[jj++] = x;
32097	x = 0;
32098	}
32099	}
32100	aOp[jj] = x;
32101	x = sqlite3_test_control(testctrl, iSize, aOp);
32102	sqlite3_fprintf(p->out, "result: %d\n", x);
32103	free(aOp);
32104	break;
32105	}
32106	case SQLITE_TESTCTRL_FAULT_INSTALL: {
32107	int kk;
32108	int bShowHelp = nArg<=2;
32109	isOk = 3;
32110	for(kk=2; kk<nArg; kk++){
32111

M extsrc/sqlite3.c

+1984 -1070

		--- extsrc/sqlite3.c
		+++ extsrc/sqlite3.c
		@@ -1,8 +1,8 @@
1	1	/******************************************************************************
2	2	** This file is an amalgamation of many separate C source files from SQLite
3		-** version 3.50.0. By combining all the individual C code files into this
	3	+** version 3.51.0. By combining all the individual C code files into this
4	4	** single large file, the entire code can be compiled as a single translation
5	5	** unit. This allows many compilers to do optimizations that would not be
6	6	** possible if the files were compiled separately. Performance improvements
7	7	** of 5% or more are commonly seen when SQLite is compiled as a single
8	8	** translation unit.
		@@ -16,11 +16,11 @@
16	16	** if you want a wrapper to interface SQLite with your choice of programming
17	17	** language. The code for the "sqlite3" command-line shell is also in a
18	18	** separate file. This file contains only code for the core SQLite library.
19	19	**
20	20	** The content in this amalgamation comes from Fossil check-in
21		-** d22475b81c4e26ccc50f3b5626d43b32f7a2 with changes in files:
	21	+** 9f184f8dfa5ef6d57e10376adc30e0060ced with changes in files:
22	22	**
23	23	**
24	24	*/
25	25	#ifndef SQLITE_AMALGAMATION
26	26	#define SQLITE_CORE 1
		@@ -463,13 +463,13 @@
463	463	**
464	464	** See also: [sqlite3_libversion()],
465	465	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466	466	** [sqlite_version()] and [sqlite_source_id()].
467	467	*/
468		-#define SQLITE_VERSION "3.50.0"
469		-#define SQLITE_VERSION_NUMBER 3050000
470		-#define SQLITE_SOURCE_ID "2025-04-15 21:59:38 d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5"
	468	+#define SQLITE_VERSION "3.51.0"
	469	+#define SQLITE_VERSION_NUMBER 3051000
	470	+#define SQLITE_SOURCE_ID "2025-07-15 19:00:01 9f184f8dfa5ef6d57e10376adc30e0060ceda07d283c23dfdfe3dbdd6608f839"
471	471
472	472	/*
473	473	** CAPI3REF: Run-Time Library Version Numbers
474	474	** KEYWORDS: sqlite3_version sqlite3_sourceid
475	475	**
		@@ -485,13 +485,13 @@
485	485	** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
486	486	** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
487	487	** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
488	488	** </pre></blockquote>)^
489	489	**
490		-** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
491		-** macro. ^The sqlite3_libversion() function returns a pointer to the
492		-** to the sqlite3_version[] string constant. The sqlite3_libversion()
	490	+** ^The sqlite3_version[] string constant contains the text of the
	491	+** [SQLITE_VERSION] macro. ^The sqlite3_libversion() function returns a
	492	+** pointer to the sqlite3_version[] string constant. The sqlite3_libversion()
493	493	** function is provided for use in DLLs since DLL users usually do not have
494	494	** direct access to string constants within the DLL. ^The
495	495	** sqlite3_libversion_number() function returns an integer equal to
496	496	** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
497	497	** a pointer to a string constant whose value is the same as the
		@@ -687,11 +687,11 @@
687	687	** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
688	688	** that allows an application to run multiple statements of SQL
689	689	** without having to use a lot of C code.
690	690	**
691	691	** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
692		-** semicolon-separate SQL statements passed into its 2nd argument,
	692	+** semicolon-separated SQL statements passed into its 2nd argument,
693	693	** in the context of the [database connection] passed in as its 1st
694	694	** argument. ^If the callback function of the 3rd argument to
695	695	** sqlite3_exec() is not NULL, then it is invoked for each result row
696	696	** coming out of the evaluated SQL statements. ^The 4th argument to
697	697	** sqlite3_exec() is relayed through to the 1st argument of each
		@@ -720,11 +720,11 @@
720	720	** callback is an array of pointers to strings obtained as if from
721	721	** [sqlite3_column_text()], one for each column. ^If an element of a
722	722	** result row is NULL then the corresponding string pointer for the
723	723	** sqlite3_exec() callback is a NULL pointer. ^The 4th argument to the
724	724	** sqlite3_exec() callback is an array of pointers to strings where each
725		-** entry represents the name of corresponding result column as obtained
	725	+** entry represents the name of a corresponding result column as obtained
726	726	** from [sqlite3_column_name()].
727	727	**
728	728	** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
729	729	** to an empty string, or a pointer that contains only whitespace and/or
730	730	** SQL comments, then no SQL statements are evaluated and the database
		@@ -906,11 +906,11 @@
906	906	** Applications should not depend on the historical behavior.
907	907	**
908	908	** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
909	909	** [sqlite3_open_v2()] does not cause the underlying database file
910	910	** to be opened using O_EXCL. Passing SQLITE_OPEN_EXCLUSIVE into
911		-** [sqlite3_open_v2()] has historically be a no-op and might become an
	911	+** [sqlite3_open_v2()] has historically been a no-op and might become an
912	912	** error in future versions of SQLite.
913	913	*/
914	914	#define SQLITE_OPEN_READONLY 0x00000001 /* Ok for sqlite3_open_v2() */
915	915	#define SQLITE_OPEN_READWRITE 0x00000002 /* Ok for sqlite3_open_v2() */
916	916	#define SQLITE_OPEN_CREATE 0x00000004 /* Ok for sqlite3_open_v2() */
		@@ -1000,11 +1000,11 @@
1000	1000	** CAPI3REF: File Locking Levels
1001	1001	**
1002	1002	** SQLite uses one of these integer values as the second
1003	1003	** argument to calls it makes to the xLock() and xUnlock() methods
1004	1004	** of an [sqlite3_io_methods] object. These values are ordered from
1005		-** lest restrictive to most restrictive.
	1005	+** least restrictive to most restrictive.
1006	1006	**
1007	1007	** The argument to xLock() is always SHARED or higher. The argument to
1008	1008	** xUnlock is either SHARED or NONE.
1009	1009	*/
1010	1010	#define SQLITE_LOCK_NONE 0 /* xUnlock() only */
		@@ -1316,11 +1316,11 @@
1316	1316	** reason, the entire database file will be overwritten by the current
1317	1317	** transaction. This is used by VACUUM operations.
1318	1318	**
1319	1319	** <li>[[SQLITE_FCNTL_VFSNAME]]
1320	1320	** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
1321		-** all [VFSes] in the VFS stack. The names are of all VFS shims and the
	1321	+** all [VFSes] in the VFS stack. The names of all VFS shims and the
1322	1322	** final bottom-level VFS are written into memory obtained from
1323	1323	** [sqlite3_malloc()] and the result is stored in the char* variable
1324	1324	** that the fourth parameter of [sqlite3_file_control()] points to.
1325	1325	** The caller is responsible for freeing the memory when done. As with
1326	1326	** all file-control actions, there is no guarantee that this will actually
		@@ -1330,11 +1330,11 @@
1330	1330	**
1331	1331	** <li>[[SQLITE_FCNTL_VFS_POINTER]]
1332	1332	** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
1333	1333	** [VFSes] currently in use. ^(The argument X in
1334	1334	** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
1335		- of type "[sqlite3_vfs] ". This opcodes will set *X
	1335	+ of type "[sqlite3_vfs] ". This opcode will set *X
1336	1336	** to a pointer to the top-level VFS.)^
1337	1337	** ^When there are multiple VFS shims in the stack, this opcode finds the
1338	1338	** upper-most shim only.
1339	1339	**
1340	1340	** <li>[[SQLITE_FCNTL_PRAGMA]]
		@@ -1520,11 +1520,11 @@
1520	1520	** record the fact that the pages have been checkpointed.
1521	1521	**
1522	1522	** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
1523	1523	** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
1524	1524	** whether or not there is a database client in another process with a wal-mode
1525		-** transaction open on the database or not. It is only available on unix.The
	1525	+** transaction open on the database or not. It is only available on unix. The
1526	1526	** (void*) argument passed with this file-control should be a pointer to a
1527	1527	** value of type (int). The integer value is set to 1 if the database is a wal
1528	1528	** mode database and there exists at least one client in another process that
1529	1529	** currently has an SQL transaction open on the database. It is set to 0 if
1530	1530	** the database is not a wal-mode db, or if there is no such connection in any
		@@ -1945,11 +1945,11 @@
1945	1945	**
1946	1946	** ^The sqlite3_initialize() routine is called internally by many other
1947	1947	** SQLite interfaces so that an application usually does not need to
1948	1948	** invoke sqlite3_initialize() directly. For example, [sqlite3_open()]
1949	1949	** calls sqlite3_initialize() so the SQLite library will be automatically
1950		-** initialized when [sqlite3_open()] is called if it has not be initialized
	1950	+** initialized when [sqlite3_open()] is called if it has not been initialized
1951	1951	** already. ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
1952	1952	** compile-time option, then the automatic calls to sqlite3_initialize()
1953	1953	** are omitted and the application must call sqlite3_initialize() directly
1954	1954	** prior to using any other SQLite interface. For maximum portability,
1955	1955	** it is recommended that applications always invoke sqlite3_initialize()
		@@ -2202,25 +2202,25 @@
2202	2202	** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
2203	2203	** is a pointer to an instance of the [sqlite3_mem_methods] structure.
2204	2204	** The [sqlite3_mem_methods]
2205	2205	** structure is filled with the currently defined memory allocation routines.)^
2206	2206	** This option can be used to overload the default memory allocation
2207		-** routines with a wrapper that simulations memory allocation failure or
	2207	+** routines with a wrapper that simulates memory allocation failure or
2208	2208	** tracks memory usage, for example. </dd>
2209	2209	**
2210	2210	** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
2211		-** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
	2211	+** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes a single argument of
2212	2212	** type int, interpreted as a boolean, which if true provides a hint to
2213	2213	** SQLite that it should avoid large memory allocations if possible.
2214	2214	** SQLite will run faster if it is free to make large memory allocations,
2215		-** but some application might prefer to run slower in exchange for
	2215	+** but some applications might prefer to run slower in exchange for
2216	2216	** guarantees about memory fragmentation that are possible if large
2217	2217	** allocations are avoided. This hint is normally off.
2218	2218	** </dd>
2219	2219	**
2220	2220	** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
2221		-** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
	2221	+** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes a single argument of type int,
2222	2222	** interpreted as a boolean, which enables or disables the collection of
2223	2223	** memory allocation statistics. ^(When memory allocation statistics are
2224	2224	** disabled, the following SQLite interfaces become non-operational:
2225	2225	** <ul>
2226	2226	** <li> [sqlite3_hard_heap_limit64()]
		@@ -2261,11 +2261,11 @@
2261	2261	** a page cache line is larger than sz bytes or if all of the pMem buffer
2262	2262	** is exhausted.
2263	2263	** ^If pMem is NULL and N is non-zero, then each database connection
2264	2264	** does an initial bulk allocation for page cache memory
2265	2265	** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
2266		-** of -1024*N bytes if N is negative, . ^If additional
	2266	+** of -1024*N bytes if N is negative. ^If additional
2267	2267	** page cache memory is needed beyond what is provided by the initial
2268	2268	** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
2269	2269	** additional cache line. </dd>
2270	2270	**
2271	2271	** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
		@@ -2290,11 +2290,11 @@
2290	2290	**
2291	2291	** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
2292	2292	** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
2293	2293	** pointer to an instance of the [sqlite3_mutex_methods] structure.
2294	2294	** The argument specifies alternative low-level mutex routines to be used
2295		-** in place the mutex routines built into SQLite.)^ ^SQLite makes a copy of
	2295	+** in place of the mutex routines built into SQLite.)^ ^SQLite makes a copy of
2296	2296	** the content of the [sqlite3_mutex_methods] structure before the call to
2297	2297	** [sqlite3_config()] returns. ^If SQLite is compiled with
2298	2298	** the [SQLITE_THREADSAFE \| SQLITE_THREADSAFE=0] compile-time option then
2299	2299	** the entire mutexing subsystem is omitted from the build and hence calls to
2300	2300	** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
		@@ -2332,11 +2332,11 @@
2332	2332	** the interface to a custom page cache implementation.)^
2333	2333	** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
2334	2334	**
2335	2335	** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
2336	2336	** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
2337		-** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies of
	2337	+** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies off
2338	2338	** the current page cache implementation into that object.)^ </dd>
2339	2339	**
2340	2340	** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
2341	2341	** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
2342	2342	** global [error log].
		@@ -2349,11 +2349,11 @@
2349	2349	** passed through as the first parameter to the application-defined logger
2350	2350	** function whenever that function is invoked. ^The second parameter to
2351	2351	** the logger function is a copy of the first parameter to the corresponding
2352	2352	** [sqlite3_log()] call and is intended to be a [result code] or an
2353	2353	** [extended result code]. ^The third parameter passed to the logger is
2354		-** log message after formatting via [sqlite3_snprintf()].
	2354	+** a log message after formatting via [sqlite3_snprintf()].
2355	2355	** The SQLite logging interface is not reentrant; the logger function
2356	2356	** supplied by the application must not invoke any SQLite interface.
2357	2357	** In a multi-threaded application, the application-defined logger
2358	2358	** function must be threadsafe. </dd>
2359	2359	**
		@@ -2540,11 +2540,11 @@
2540	2540	** CAPI3REF: Database Connection Configuration Options
2541	2541	**
2542	2542	** These constants are the available integer configuration options that
2543	2543	** can be passed as the second parameter to the [sqlite3_db_config()] interface.
2544	2544	**
2545		-** The [sqlite3_db_config()] interface is a var-args functions. It takes a
	2545	+** The [sqlite3_db_config()] interface is a var-args function. It takes a
2546	2546	** variable number of parameters, though always at least two. The number of
2547	2547	** parameters passed into sqlite3_db_config() depends on which of these
2548	2548	** constants is given as the second parameter. This documentation page
2549	2549	** refers to parameters beyond the second as "arguments". Thus, when this
2550	2550	** page says "the N-th argument" it means "the N-th parameter past the
		@@ -2674,12 +2674,12 @@
2674	2674	** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
2675	2675	** There must be two additional arguments.
2676	2676	** When the first argument to this interface is 1, then only the C-API is
2677	2677	** enabled and the SQL function remains disabled. If the first argument to
2678	2678	** this interface is 0, then both the C-API and the SQL function are disabled.
2679		-** If the first argument is -1, then no changes are made to state of either the
2680		-** C-API or the SQL function.
	2679	+** If the first argument is -1, then no changes are made to the state of either
	2680	+** the C-API or the SQL function.
2681	2681	** The second parameter is a pointer to an integer into which
2682	2682	** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
2683	2683	** is disabled or enabled following this call. The second parameter may
2684	2684	** be a NULL pointer, in which case the new setting is not reported back.
2685	2685	** </dd>
		@@ -2793,11 +2793,11 @@
2793	2793	** </dd>
2794	2794	**
2795	2795	** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
2796	2796	** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
2797	2797	** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
2798		-** the legacy behavior of the [ALTER TABLE RENAME] command such it
	2798	+** the legacy behavior of the [ALTER TABLE RENAME] command such that it
2799	2799	** behaves as it did prior to [version 3.24.0] (2018-06-04). See the
2800	2800	** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
2801	2801	** additional information. This feature can also be turned on and off
2802	2802	** using the [PRAGMA legacy_alter_table] statement.
2803	2803	** </dd>
		@@ -2842,11 +2842,11 @@
2842	2842	**
2843	2843	** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
2844	2844	** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
2845	2845	** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
2846	2846	** the legacy file format flag. When activated, this flag causes all newly
2847		-** created database file to have a schema format version number (the 4-byte
	2847	+** created database files to have a schema format version number (the 4-byte
2848	2848	** integer found at offset 44 into the database header) of 1. This in turn
2849	2849	** means that the resulting database file will be readable and writable by
2850	2850	** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
2851	2851	** newly created databases are generally not understandable by SQLite versions
2852	2852	** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
		@@ -2869,11 +2869,11 @@
2869	2869	** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2870	2870	** statistics. For statistics to be collected, the flag must be set on
2871	2871	** the database handle both when the SQL statement is prepared and when it
2872	2872	** is stepped. The flag is set (collection of statistics is enabled)
2873	2873	** by default. <p>This option takes two arguments: an integer and a pointer to
2874		-** an integer.. The first argument is 1, 0, or -1 to enable, disable, or
	2874	+** an integer. The first argument is 1, 0, or -1 to enable, disable, or
2875	2875	** leave unchanged the statement scanstatus option. If the second argument
2876	2876	** is not NULL, then the value of the statement scanstatus setting after
2877	2877	** processing the first argument is written into the integer that the second
2878	2878	** argument points to.
2879	2879	** </dd>
		@@ -2912,12 +2912,12 @@
2912	2912	** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
2913	2913	** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
2914	2914	** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
2915	2915	** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
2916	2916	** This capability is enabled by default. Applications can disable or
2917		-** reenable this capability using the current DBCONFIG option. If the
2918		-** the this capability is disabled, the [ATTACH] command will still work,
	2917	+** reenable this capability using the current DBCONFIG option. If
	2918	+** this capability is disabled, the [ATTACH] command will still work,
2919	2919	** but the database will be opened read-only. If this option is disabled,
2920	2920	** then the ability to create a new database using [ATTACH] is also disabled,
2921	2921	** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
2922	2922	** option.<p>
2923	2923	** This option takes two arguments which are an integer and a pointer
		@@ -2947,11 +2947,11 @@
2947	2947	**
2948	2948	** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
2949	2949	**
2950	2950	** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
2951	2951	** overall call to [sqlite3_db_config()] has a total of four parameters.
2952		-** The first argument (the third parameter to sqlite3_db_config()) is a integer.
	2952	+** The first argument (the third parameter to sqlite3_db_config()) is an integer.
2953	2953	** The second argument is a pointer to an integer. If the first argument is 1,
2954	2954	** then the option becomes enabled. If the first integer argument is 0, then the
2955	2955	** option is disabled. If the first argument is -1, then the option setting
2956	2956	** is unchanged. The second argument, the pointer to an integer, may be NULL.
2957	2957	** If the second argument is not NULL, then a value of 0 or 1 is written into
		@@ -3237,11 +3237,11 @@
3237	3237	** and comments that follow the final semicolon are ignored.
3238	3238	**
3239	3239	** ^These routines return 0 if the statement is incomplete. ^If a
3240	3240	** memory allocation fails, then SQLITE_NOMEM is returned.
3241	3241	**
3242		-** ^These routines do not parse the SQL statements thus
	3242	+** ^These routines do not parse the SQL statements and thus
3243	3243	** will not detect syntactically incorrect SQL.
3244	3244	**
3245	3245	** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
3246	3246	** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
3247	3247	** automatically by sqlite3_complete16(). If that initialization fails,
		@@ -3354,11 +3354,11 @@
3354	3354	** Passing 0 to this function disables blocking locks altogether. Passing
3355	3355	** -1 to this function requests that the VFS blocks for a long time -
3356	3356	** indefinitely if possible. The results of passing any other negative value
3357	3357	** are undefined.
3358	3358	**
3359		-** Internally, each SQLite database handle store two timeout values - the
	3359	+** Internally, each SQLite database handle stores two timeout values - the
3360	3360	** busy-timeout (used for rollback mode databases, or if the VFS does not
3361	3361	** support blocking locks) and the setlk-timeout (used for blocking locks
3362	3362	** on wal-mode databases). The sqlite3_busy_timeout() method sets both
3363	3363	** values, this function sets only the setlk-timeout value. Therefore,
3364	3364	** to configure separate busy-timeout and setlk-timeout values for a single
		@@ -3384,11 +3384,11 @@
3384	3384	** METHOD: sqlite3
3385	3385	**
3386	3386	** This is a legacy interface that is preserved for backwards compatibility.
3387	3387	** Use of this interface is not recommended.
3388	3388	**
3389		-** Definition: A <b>result table</b> is memory data structure created by the
	3389	+** Definition: A <b>result table</b> is a memory data structure created by the
3390	3390	** [sqlite3_get_table()] interface. A result table records the
3391	3391	** complete query results from one or more queries.
3392	3392	**
3393	3393	** The table conceptually has a number of rows and columns. But
3394	3394	** these numbers are not part of the result table itself. These
		@@ -3527,11 +3527,11 @@
3527	3527	** of a signed 32-bit integer.
3528	3528	**
3529	3529	** ^Calling sqlite3_free() with a pointer previously returned
3530	3530	** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
3531	3531	** that it might be reused. ^The sqlite3_free() routine is
3532		-** a no-op if is called with a NULL pointer. Passing a NULL pointer
	3532	+** a no-op if it is called with a NULL pointer. Passing a NULL pointer
3533	3533	** to sqlite3_free() is harmless. After being freed, memory
3534	3534	** should neither be read nor written. Even reading previously freed
3535	3535	** memory might result in a segmentation fault or other severe error.
3536	3536	** Memory corruption, a segmentation fault, or other severe error
3537	3537	** might result if sqlite3_free() is called with a non-NULL pointer that
		@@ -3545,17 +3545,17 @@
3545	3545	** ^If the N parameter to sqlite3_realloc(X,N) is zero or
3546	3546	** negative then the behavior is exactly the same as calling
3547	3547	** sqlite3_free(X).
3548	3548	** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
3549	3549	** of at least N bytes in size or NULL if insufficient memory is available.
3550		-** ^If M is the size of the prior allocation, then min(N,M) bytes
3551		-** of the prior allocation are copied into the beginning of buffer returned
	3550	+** ^If M is the size of the prior allocation, then min(N,M) bytes of the
	3551	+** prior allocation are copied into the beginning of the buffer returned
3552	3552	** by sqlite3_realloc(X,N) and the prior allocation is freed.
3553	3553	** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
3554	3554	** prior allocation is not freed.
3555	3555	**
3556		-** ^The sqlite3_realloc64(X,N) interfaces works the same as
	3556	+** ^The sqlite3_realloc64(X,N) interface works the same as
3557	3557	** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
3558	3558	** of a 32-bit signed integer.
3559	3559	**
3560	3560	** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
3561	3561	** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
		@@ -3601,11 +3601,11 @@
3601	3601	** ^The [sqlite3_memory_highwater()] routine returns the maximum
3602	3602	** value of [sqlite3_memory_used()] since the high-water mark
3603	3603	** was last reset. ^The values returned by [sqlite3_memory_used()] and
3604	3604	** [sqlite3_memory_highwater()] include any overhead
3605	3605	** added by SQLite in its implementation of [sqlite3_malloc()],
3606		-** but not overhead added by the any underlying system library
	3606	+** but not overhead added by any underlying system library
3607	3607	** routines that [sqlite3_malloc()] may call.
3608	3608	**
3609	3609	** ^The memory high-water mark is reset to the current value of
3610	3610	** [sqlite3_memory_used()] if and only if the parameter to
3611	3611	** [sqlite3_memory_highwater()] is true. ^The value returned
		@@ -4053,19 +4053,19 @@
4053	4053	** attempt to use the same database connection at the same time.
4054	4054	** (Mutexes will block any actual concurrency, but in this mode
4055	4055	** there is no harm in trying.)
4056	4056	**
4057	4057	** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
4058		-** <dd>The database is opened [shared cache] enabled, overriding
	4058	+** <dd>The database is opened with [shared cache] enabled, overriding
4059	4059	** the default shared cache setting provided by
4060	4060	** [sqlite3_enable_shared_cache()].)^
4061	4061	** The [use of shared cache mode is discouraged] and hence shared cache
4062	4062	** capabilities may be omitted from many builds of SQLite. In such cases,
4063	4063	** this option is a no-op.
4064	4064	**
4065	4065	** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
4066		-** <dd>The database is opened [shared cache] disabled, overriding
	4066	+** <dd>The database is opened with [shared cache] disabled, overriding
4067	4067	** the default shared cache setting provided by
4068	4068	** [sqlite3_enable_shared_cache()].)^
4069	4069	**
4070	4070	** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
4071	4071	** <dd>The database connection comes up in "extended result code mode".
		@@ -4396,11 +4396,11 @@
4396	4396	** These interfaces are provided for use by [VFS shim] implementations and
4397	4397	** are not useful outside of that context.
4398	4398	**
4399	4399	** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
4400	4400	** database filename D with corresponding journal file J and WAL file W and
4401		-** with N URI parameters key/values pairs in the array P. The result from
	4401	+** an array P of N URI Key/Value pairs. The result from
4402	4402	** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
4403	4403	** is safe to pass to routines like:
4404	4404	** <ul>
4405	4405	** <li> [sqlite3_uri_parameter()],
4406	4406	** <li> [sqlite3_uri_boolean()],
		@@ -4479,19 +4479,19 @@
4479	4479	** The application does not need to worry about freeing the result.
4480	4480	** However, the error string might be overwritten or deallocated by
4481	4481	** subsequent calls to other SQLite interface functions.)^
4482	4482	**
4483	4483	** ^The sqlite3_errstr(E) interface returns the English-language text
4484		-** that describes the [result code] E, as UTF-8, or NULL if E is not an
	4484	+** that describes the [result code] E, as UTF-8, or NULL if E is not a
4485	4485	** result code for which a text error message is available.
4486	4486	** ^(Memory to hold the error message string is managed internally
4487	4487	** and must not be freed by the application)^.
4488	4488	**
4489	4489	** ^If the most recent error references a specific token in the input
4490	4490	** SQL, the sqlite3_error_offset() interface returns the byte offset
4491	4491	** of the start of that token. ^The byte offset returned by
4492		-** sqlite3_error_offset() assumes that the input SQL is UTF8.
	4492	+** sqlite3_error_offset() assumes that the input SQL is UTF-8.
4493	4493	** ^If the most recent error does not reference a specific token in the input
4494	4494	** SQL, then the sqlite3_error_offset() function returns -1.
4495	4495	**
4496	4496	** When the serialized [threading mode] is in use, it might be the
4497	4497	** case that a second error occurs on a separate thread in between
		@@ -4586,12 +4586,12 @@
4586	4586	** CAPI3REF: Run-Time Limit Categories
4587	4587	** KEYWORDS: {limit category} {*limit categories}
4588	4588	**
4589	4589	** These constants define various performance limits
4590	4590	** that can be lowered at run-time using [sqlite3_limit()].
4591		-** The synopsis of the meanings of the various limits is shown below.
4592		-** Additional information is available at [limits \| Limits in SQLite].
	4591	+** A concise description of these limits follows, and additional information
	4592	+** is available at [limits \| Limits in SQLite].
4593	4593	**
4594	4594	** <dl>
4595	4595	** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
4596	4596	** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
4597	4597	**
		@@ -4652,11 +4652,11 @@
4652	4652	#define SQLITE_LIMIT_WORKER_THREADS 11
4653	4653
4654	4654	/*
4655	4655	** CAPI3REF: Prepare Flags
4656	4656	**
4657		-** These constants define various flags that can be passed into
	4657	+** These constants define various flags that can be passed into the
4658	4658	** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
4659	4659	** [sqlite3_prepare16_v3()] interfaces.
4660	4660	**
4661	4661	** New flags may be added in future releases of SQLite.
4662	4662	**
		@@ -4739,11 +4739,11 @@
4739	4739	** statement is generated.
4740	4740	** If the caller knows that the supplied string is nul-terminated, then
4741	4741	** there is a small performance advantage to passing an nByte parameter that
4742	4742	** is the number of bytes in the input string <i>including</i>
4743	4743	** the nul-terminator.
4744		-** Note that nByte measure the length of the input in bytes, not
	4744	+** Note that nByte measures the length of the input in bytes, not
4745	4745	** characters, even for the UTF-16 interfaces.
4746	4746	**
4747	4747	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
4748	4748	** past the end of the first SQL statement in zSql. These routines only
4749	4749	** compile the first statement in zSql, so *pzTail is left pointing to
		@@ -4873,11 +4873,11 @@
4873	4873	** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
4874	4874	** will return "SELECT 2345,NULL".)^
4875	4875	**
4876	4876	** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
4877	4877	** is available to hold the result, or if the result would exceed the
4878		-** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
	4878	+** maximum string length determined by the [SQLITE_LIMIT_LENGTH].
4879	4879	**
4880	4880	** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
4881	4881	** bound parameter expansions. ^The [SQLITE_OMIT_TRACE] compile-time
4882	4882	** option causes sqlite3_expanded_sql() to always return NULL.
4883	4883	**
		@@ -5061,11 +5061,11 @@
5061	5061	/*
5062	5062	** CAPI3REF: SQL Function Context Object
5063	5063	**
5064	5064	** The context in which an SQL function executes is stored in an
5065	5065	** sqlite3_context object. ^A pointer to an sqlite3_context object
5066		-** is always first parameter to [application-defined SQL functions].
	5066	+** is always the first parameter to [application-defined SQL functions].
5067	5067	** The application-defined SQL function implementation will pass this
5068	5068	** pointer through into calls to [sqlite3_result_int \| sqlite3_result()],
5069	5069	** [sqlite3_aggregate_context()], [sqlite3_user_data()],
5070	5070	** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
5071	5071	** and/or [sqlite3_set_auxdata()].
		@@ -5077,11 +5077,11 @@
5077	5077	** KEYWORDS: {host parameter} {host parameters} {host parameter name}
5078	5078	** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
5079	5079	** METHOD: sqlite3_stmt
5080	5080	**
5081	5081	** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
5082		-** literals may be replaced by a [parameter] that matches one of following
	5082	+** literals may be replaced by a [parameter] that matches one of the following
5083	5083	** templates:
5084	5084	**
5085	5085	** <ul>
5086	5086	** <li> ?
5087	5087	** <li> ?NNN
		@@ -5122,11 +5122,11 @@
5122	5122	** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
5123	5123	** otherwise.
5124	5124	**
5125	5125	** [[byte-order determination rules]] ^The byte-order of
5126	5126	** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
5127		-** found in first character, which is removed, or in the absence of a BOM
	5127	+** found in the first character, which is removed, or in the absence of a BOM
5128	5128	** the byte order is the native byte order of the host
5129	5129	** machine for sqlite3_bind_text16() or the byte order specified in
5130	5130	** the 6th parameter for sqlite3_bind_text64().)^
5131	5131	** ^If UTF16 input text contains invalid unicode
5132	5132	** characters, then SQLite might change those invalid characters
		@@ -5142,11 +5142,11 @@
5142	5142	** the behavior is undefined.
5143	5143	** If a non-negative fourth parameter is provided to sqlite3_bind_text()
5144	5144	** or sqlite3_bind_text16() or sqlite3_bind_text64() then
5145	5145	** that parameter must be the byte offset
5146	5146	** where the NUL terminator would occur assuming the string were NUL
5147		-** terminated. If any NUL characters occurs at byte offsets less than
	5147	+** terminated. If any NUL characters occur at byte offsets less than
5148	5148	** the value of the fourth parameter then the resulting string value will
5149	5149	** contain embedded NULs. The result of expressions involving strings
5150	5150	** with embedded NULs is undefined.
5151	5151	**
5152	5152	** ^The fifth argument to the BLOB and string binding interfaces controls
		@@ -5354,11 +5354,11 @@
5354	5354	/*
5355	5355	** CAPI3REF: Source Of Data In A Query Result
5356	5356	** METHOD: sqlite3_stmt
5357	5357	**
5358	5358	** ^These routines provide a means to determine the database, table, and
5359		-** table column that is the origin of a particular result column in
	5359	+** table column that is the origin of a particular result column in a
5360	5360	** [SELECT] statement.
5361	5361	** ^The name of the database or table or column can be returned as
5362	5362	** either a UTF-8 or UTF-16 string. ^The _database_ routines return
5363	5363	** the database name, the _table_ routines return the table name, and
5364	5364	** the origin_ routines return the column name.
		@@ -5798,11 +5798,11 @@
5798	5798	** CAPI3REF: Destroy A Prepared Statement Object
5799	5799	** DESTRUCTOR: sqlite3_stmt
5800	5800	**
5801	5801	** ^The sqlite3_finalize() function is called to delete a [prepared statement].
5802	5802	** ^If the most recent evaluation of the statement encountered no errors
5803		-** or if the statement is never been evaluated, then sqlite3_finalize() returns
	5803	+** or if the statement has never been evaluated, then sqlite3_finalize() returns
5804	5804	** SQLITE_OK. ^If the most recent evaluation of statement S failed, then
5805	5805	** sqlite3_finalize(S) returns the appropriate [error code] or
5806	5806	** [extended error code].
5807	5807	**
5808	5808	** ^The sqlite3_finalize(S) routine can be called at any point during
		@@ -5923,12 +5923,12 @@
5923	5923	** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
5924	5924	** index expressions, or the WHERE clause of partial indexes.
5925	5925	**
5926	5926	** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
5927	5927	** all application-defined SQL functions that do not need to be
5928		-** used inside of triggers, view, CHECK constraints, or other elements of
5929		-** the database schema. This flags is especially recommended for SQL
	5928	+** used inside of triggers, views, CHECK constraints, or other elements of
	5929	+** the database schema. This flag is especially recommended for SQL
5930	5930	** functions that have side effects or reveal internal application state.
5931	5931	** Without this flag, an attacker might be able to modify the schema of
5932	5932	** a database file to include invocations of the function with parameters
5933	5933	** chosen by the attacker, which the application will then execute when
5934	5934	** the database file is opened and read.
		@@ -5955,11 +5955,11 @@
5955	5955	** or aggregate window function. More details regarding the implementation
5956	5956	** of aggregate window functions are
5957	5957	** [user-defined window functions\|available here].
5958	5958	**
5959	5959	** ^(If the final parameter to sqlite3_create_function_v2() or
5960		-** sqlite3_create_window_function() is not NULL, then it is destructor for
	5960	+** sqlite3_create_window_function() is not NULL, then it is the destructor for
5961	5961	** the application data pointer. The destructor is invoked when the function
5962	5962	** is deleted, either by being overloaded or when the database connection
5963	5963	** closes.)^ ^The destructor is also invoked if the call to
5964	5964	** sqlite3_create_function_v2() fails. ^When the destructor callback is
5965	5965	** invoked, it is passed a single argument which is a copy of the application
		@@ -6030,11 +6030,11 @@
6030	6030	);
6031	6031
6032	6032	/*
6033	6033	** CAPI3REF: Text Encodings
6034	6034	**
6035		-** These constant define integer codes that represent the various
	6035	+** These constants define integer codes that represent the various
6036	6036	** text encodings supported by SQLite.
6037	6037	*/
6038	6038	#define SQLITE_UTF8 1 /* IMP: R-37514-35566 */
6039	6039	#define SQLITE_UTF16LE 2 /* IMP: R-03371-37637 */
6040	6040	#define SQLITE_UTF16BE 3 /* IMP: R-51971-34154 */
		@@ -6122,11 +6122,11 @@
6122	6122	** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
6123	6123	** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
6124	6124	** result.
6125	6125	** Every function that invokes [sqlite3_result_subtype()] should have this
6126	6126	** property. If it does not, then the call to [sqlite3_result_subtype()]
6127		-** might become a no-op if the function is used as term in an
	6127	+** might become a no-op if the function is used as a term in an
6128	6128	** [expression index]. On the other hand, SQL functions that never invoke
6129	6129	** [sqlite3_result_subtype()] should avoid setting this property, as the
6130	6130	** purpose of this property is to disable certain optimizations that are
6131	6131	** incompatible with subtypes.
6132	6132	**
		@@ -6249,11 +6249,11 @@
6249	6249	**
6250	6250	** ^Within the [xUpdate] method of a [virtual table], the
6251	6251	** sqlite3_value_nochange(X) interface returns true if and only if
6252	6252	** the column corresponding to X is unchanged by the UPDATE operation
6253	6253	** that the xUpdate method call was invoked to implement and if
6254		-** and the prior [xColumn] method call that was invoked to extracted
	6254	+** the prior [xColumn] method call that was invoked to extract
6255	6255	** the value for that column returned without setting a result (probably
6256	6256	** because it queried [sqlite3_vtab_nochange()] and found that the column
6257	6257	** was unchanging). ^Within an [xUpdate] method, any value for which
6258	6258	** sqlite3_value_nochange(X) is true will in all other respects appear
6259	6259	** to be a NULL value. If sqlite3_value_nochange(X) is invoked anywhere other
		@@ -6355,11 +6355,11 @@
6355	6355	/*
6356	6356	** CAPI3REF: Copy And Free SQL Values
6357	6357	** METHOD: sqlite3_value
6358	6358	**
6359	6359	** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
6360		-** object D and returns a pointer to that copy. ^The [sqlite3_value] returned
	6360	+** object V and returns a pointer to that copy. ^The [sqlite3_value] returned
6361	6361	** is a [protected sqlite3_value] object even if the input is not.
6362	6362	** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
6363	6363	** memory allocation fails. ^If V is a [pointer value], then the result
6364	6364	** of sqlite3_value_dup(V) is a NULL value.
6365	6365	**
		@@ -6393,11 +6393,11 @@
6393	6393	** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
6394	6394	** when first called if N is less than or equal to zero or if a memory
6395	6395	** allocation error occurs.
6396	6396	**
6397	6397	** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
6398		-** determined by the N parameter on first successful call. Changing the
	6398	+** determined by the N parameter on the first successful call. Changing the
6399	6399	** value of N in any subsequent call to sqlite3_aggregate_context() within
6400	6400	** the same aggregate function instance will not resize the memory
6401	6401	** allocation.)^ Within the xFinal callback, it is customary to set
6402	6402	** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
6403	6403	** pointless memory allocations occur.
		@@ -6555,11 +6555,11 @@
6555	6555	** of as a secret key such that only code that knows the secret key is able
6556	6556	** to access the associated data.
6557	6557	**
6558	6558	** Security Warning: These interfaces should not be exposed in scripting
6559	6559	** languages or in other circumstances where it might be possible for an
6560		-** an attacker to invoke them. Any agent that can invoke these interfaces
	6560	+** attacker to invoke them. Any agent that can invoke these interfaces
6561	6561	** can probably also take control of the process.
6562	6562	**
6563	6563	** Database connection client data is only available for SQLite
6564	6564	** version 3.44.0 ([dateof:3.44.0]) and later.
6565	6565	**
		@@ -6669,11 +6669,11 @@
6669	6669	** ^If the 3rd parameter to the sqlite3_result_text* interfaces
6670	6670	** is non-negative, then as many bytes (not characters) of the text
6671	6671	** pointed to by the 2nd parameter are taken as the application-defined
6672	6672	** function result. If the 3rd parameter is non-negative, then it
6673	6673	** must be the byte offset into the string where the NUL terminator would
6674		-** appear if the string where NUL terminated. If any NUL characters occur
	6674	+** appear if the string were NUL terminated. If any NUL characters occur
6675	6675	** in the string at a byte offset that is less than the value of the 3rd
6676	6676	** parameter, then the resulting string will contain embedded NULs and the
6677	6677	** result of expressions operating on strings with embedded NULs is undefined.
6678	6678	** ^If the 4th parameter to the sqlite3_result_text* interfaces
6679	6679	** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
		@@ -6727,11 +6727,11 @@
6727	6727	** for the P parameter. ^SQLite invokes D with P as its only argument
6728	6728	** when SQLite is finished with P. The T parameter should be a static
6729	6729	** string and preferably a string literal. The sqlite3_result_pointer()
6730	6730	** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
6731	6731	**
6732		-** If these routines are called from within the different thread
	6732	+** If these routines are called from within a different thread
6733	6733	** than the one containing the application-defined function that received
6734	6734	** the [sqlite3_context] pointer, the results are undefined.
6735	6735	*/
6736	6736	SQLITE_API void sqlite3_result_blob(sqlite3_context, const void, int, void()(void));
6737	6737	SQLITE_API void sqlite3_result_blob64(sqlite3_context,const void,
		@@ -7133,11 +7133,11 @@
7133	7133	/*
7134	7134	** CAPI3REF: Return The Schema Name For A Database Connection
7135	7135	** METHOD: sqlite3
7136	7136	**
7137	7137	** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
7138		-** for the N-th database on database connection D, or a NULL pointer of N is
	7138	+** for the N-th database on database connection D, or a NULL pointer if N is
7139	7139	** out of range. An N value of 0 means the main database file. An N of 1 is
7140	7140	** the "temp" schema. Larger values of N correspond to various ATTACH-ed
7141	7141	** databases.
7142	7142	**
7143	7143	** Space to hold the string that is returned by sqlite3_db_name() is managed
		@@ -7228,20 +7228,20 @@
7228	7228	**
7229	7229	** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
7230	7230	** <dd>The SQLITE_TXN_READ state means that the database is currently
7231	7231	** in a read transaction. Content has been read from the database file
7232	7232	** but nothing in the database file has changed. The transaction state
7233		-** will advanced to SQLITE_TXN_WRITE if any changes occur and there are
	7233	+** will be advanced to SQLITE_TXN_WRITE if any changes occur and there are
7234	7234	** no other conflicting concurrent write transactions. The transaction
7235	7235	** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
7236	7236	** [COMMIT].</dd>
7237	7237	**
7238	7238	** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
7239	7239	** <dd>The SQLITE_TXN_WRITE state means that the database is currently
7240	7240	** in a write transaction. Content has been written to the database file
7241	7241	** but has not yet committed. The transaction state will change to
7242		-** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
	7242	+** SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
7243	7243	*/
7244	7244	#define SQLITE_TXN_NONE 0
7245	7245	#define SQLITE_TXN_READ 1
7246	7246	#define SQLITE_TXN_WRITE 2
7247	7247
		@@ -7518,11 +7518,11 @@
7518	7518
7519	7519	/*
7520	7520	** CAPI3REF: Impose A Limit On Heap Size
7521	7521	**
7522	7522	** These interfaces impose limits on the amount of heap memory that will be
7523		-** by all database connections within a single process.
	7523	+** used by all database connections within a single process.
7524	7524	**
7525	7525	** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
7526	7526	** soft limit on the amount of heap memory that may be allocated by SQLite.
7527	7527	** ^SQLite strives to keep heap memory utilization below the soft heap
7528	7528	** limit by reducing the number of pages held in the page cache
		@@ -7576,11 +7576,11 @@
7576	7576	** by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
7577	7577	** from the heap.
7578	7578	** </ul>)^
7579	7579	**
7580	7580	** The circumstances under which SQLite will enforce the heap limits may
7581		-** changes in future releases of SQLite.
	7581	+** change in future releases of SQLite.
7582	7582	*/
7583	7583	SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
7584	7584	SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
7585	7585
7586	7586	/*
		@@ -7691,12 +7691,12 @@
7691	7691	** be tried also.
7692	7692	**
7693	7693	** ^The entry point is zProc.
7694	7694	** ^(zProc may be 0, in which case SQLite will try to come up with an
7695	7695	** entry point name on its own. It first tries "sqlite3_extension_init".
7696		-** If that does not work, it constructs a name "sqlite3_X_init" where the
7697		-** X is consists of the lower-case equivalent of all ASCII alphabetic
	7696	+** If that does not work, it constructs a name "sqlite3_X_init" where
	7697	+** X consists of the lower-case equivalent of all ASCII alphabetic
7698	7698	** characters in the filename from the last "/" to the first following
7699	7699	** "." and omitting any initial "lib".)^
7700	7700	** ^The sqlite3_load_extension() interface returns
7701	7701	** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
7702	7702	** ^If an error occurs and pzErrMsg is not 0, then the
		@@ -7763,11 +7763,11 @@
7763	7763	** that is to be automatically loaded into all new database connections.
7764	7764	**
7765	7765	** ^(Even though the function prototype shows that xEntryPoint() takes
7766	7766	** no arguments and returns void, SQLite invokes xEntryPoint() with three
7767	7767	** arguments and expects an integer result as if the signature of the
7768		-** entry point where as follows:
	7768	+** entry point were as follows:
7769	7769	**
7770	7770	** <blockquote><pre>
7771	7771	**   int xEntryPoint(
7772	7772	**   sqlite3 *db,
7773	7773	const char pzErrMsg,
		@@ -7927,11 +7927,11 @@
7927	7927	** and becomes the argvIndex-th entry in argv. ^(If aConstraintUsage[].omit
7928	7928	** is true, then the constraint is assumed to be fully handled by the
7929	7929	** virtual table and might not be checked again by the byte code.)^ ^(The
7930	7930	** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
7931	7931	** is left in its default setting of false, the constraint will always be
7932		-** checked separately in byte code. If the omit flag is change to true, then
	7932	+** checked separately in byte code. If the omit flag is changed to true, then
7933	7933	** the constraint may or may not be checked in byte code. In other words,
7934	7934	** when the omit flag is true there is no guarantee that the constraint will
7935	7935	** not be checked again using byte code.)^
7936	7936	**
7937	7937	** ^The idxNum and idxStr values are recorded and passed into the
		@@ -7953,11 +7953,11 @@
7953	7953	** will be returned by the strategy.
7954	7954	**
7955	7955	** The xBestIndex method may optionally populate the idxFlags field with a
7956	7956	** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
7957	7957	** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
7958		-** output to show the idxNum has hex instead of as decimal. Another flag is
	7958	+** output to show the idxNum as hex instead of as decimal. Another flag is
7959	7959	** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
7960	7960	** return at most one row.
7961	7961	**
7962	7962	** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
7963	7963	** SQLite also assumes that if a call to the xUpdate() method is made as
		@@ -8094,11 +8094,11 @@
8094	8094	** by the first parameter. ^The name of the module is given by the
8095	8095	** second parameter. ^The third parameter is a pointer to
8096	8096	** the implementation of the [virtual table module]. ^The fourth
8097	8097	** parameter is an arbitrary client data pointer that is passed through
8098	8098	** into the [xCreate] and [xConnect] methods of the virtual table module
8099		-** when a new virtual table is be being created or reinitialized.
	8099	+** when a new virtual table is being created or reinitialized.
8100	8100	**
8101	8101	** ^The sqlite3_create_module_v2() interface has a fifth parameter which
8102	8102	** is a pointer to a destructor for the pClientData. ^SQLite will
8103	8103	** invoke the destructor function (if it is not NULL) when SQLite
8104	8104	** no longer needs the pClientData pointer. ^The destructor will also
		@@ -8259,11 +8259,11 @@
8259	8259	**
8260	8260	** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
8261	8261	** in *ppBlob. Otherwise an [error code] is returned and, unless the error
8262	8262	** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
8263	8263	** the API is not misused, it is always safe to call [sqlite3_blob_close()]
8264		-** on *ppBlob after this function it returns.
	8264	+** on *ppBlob after this function returns.
8265	8265	**
8266	8266	** This function fails with SQLITE_ERROR if any of the following are true:
8267	8267	** <ul>
8268	8268	** <li> ^(Database zDb does not exist)^,
8269	8269	** <li> ^(Table zTable does not exist within database zDb)^,
		@@ -8379,11 +8379,11 @@
8379	8379	** CAPI3REF: Return The Size Of An Open BLOB
8380	8380	** METHOD: sqlite3_blob
8381	8381	**
8382	8382	** ^Returns the size in bytes of the BLOB accessible via the
8383	8383	** successfully opened [BLOB handle] in its only argument. ^The
8384		-** incremental blob I/O routines can only read or overwriting existing
	8384	+** incremental blob I/O routines can only read or overwrite existing
8385	8385	** blob content; they cannot change the size of a blob.
8386	8386	**
8387	8387	** This routine only works on a [BLOB handle] which has been created
8388	8388	** by a prior successful call to [sqlite3_blob_open()] and which has not
8389	8389	** been closed by [sqlite3_blob_close()]. Passing any other pointer in
		@@ -8529,11 +8529,11 @@
8529	8529	** function that calls sqlite3_initialize().
8530	8530	**
8531	8531	** ^The sqlite3_mutex_alloc() routine allocates a new
8532	8532	** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
8533	8533	** routine returns NULL if it is unable to allocate the requested
8534		-** mutex. The argument to sqlite3_mutex_alloc() must one of these
	8534	+** mutex. The argument to sqlite3_mutex_alloc() must be one of these
8535	8535	** integer constants:
8536	8536	**
8537	8537	** <ul>
8538	8538	** <li> SQLITE_MUTEX_FAST
8539	8539	** <li> SQLITE_MUTEX_RECURSIVE
		@@ -8762,11 +8762,11 @@
8762	8762
8763	8763	/*
8764	8764	** CAPI3REF: Retrieve the mutex for a database connection
8765	8765	** METHOD: sqlite3
8766	8766	**
8767		-** ^This interface returns a pointer the [sqlite3_mutex] object that
	8767	+** ^This interface returns a pointer to the [sqlite3_mutex] object that
8768	8768	** serializes access to the [database connection] given in the argument
8769	8769	** when the [threading mode] is Serialized.
8770	8770	** ^If the [threading mode] is Single-thread or Multi-thread then this
8771	8771	** routine returns a NULL pointer.
8772	8772	*/
		@@ -8885,11 +8885,11 @@
8885	8885
8886	8886	/*
8887	8887	** CAPI3REF: SQL Keyword Checking
8888	8888	**
8889	8889	** These routines provide access to the set of SQL language keywords
8890		-** recognized by SQLite. Applications can uses these routines to determine
	8890	+** recognized by SQLite. Applications can use these routines to determine
8891	8891	** whether or not a specific identifier needs to be escaped (for example,
8892	8892	** by enclosing in double-quotes) so as not to confuse the parser.
8893	8893	**
8894	8894	** The sqlite3_keyword_count() interface returns the number of distinct
8895	8895	** keywords understood by SQLite.
		@@ -9053,11 +9053,11 @@
9053	9053	**
9054	9054	** ^The [sqlite3_str_value(X)] method returns a pointer to the current
9055	9055	** content of the dynamic string under construction in X. The value
9056	9056	** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
9057	9057	** and might be freed or altered by any subsequent method on the same
9058		-** [sqlite3_str] object. Applications must not used the pointer returned
	9058	+** [sqlite3_str] object. Applications must not use the pointer returned by
9059	9059	** [sqlite3_str_value(X)] after any subsequent method call on the same
9060	9060	** object. ^Applications may change the content of the string returned
9061	9061	** by [sqlite3_str_value(X)] as long as they do not write into any bytes
9062	9062	** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
9063	9063	** write any byte after any subsequent sqlite3_str method call.
		@@ -9139,11 +9139,11 @@
9139	9139	** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
9140	9140	** <dd>This parameter returns the number of bytes of page cache
9141	9141	** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
9142	9142	** buffer and where forced to overflow to [sqlite3_malloc()]. The
9143	9143	** returned value includes allocations that overflowed because they
9144		-** where too large (they were larger than the "sz" parameter to
	9144	+** were too large (they were larger than the "sz" parameter to
9145	9145	** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
9146	9146	** no space was left in the page cache.</dd>)^
9147	9147	**
9148	9148	** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
9149	9149	** <dd>This parameter records the largest memory allocation request
		@@ -9223,53 +9223,55 @@
9223	9223	** checked out.</dd>)^
9224	9224	**
9225	9225	** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
9226	9226	** <dd>This parameter returns the number of malloc attempts that were
9227	9227	** satisfied using lookaside memory. Only the high-water value is meaningful;
9228		-** the current value is always zero.)^
	9228	+** the current value is always zero.</dd>)^
9229	9229	**
9230	9230	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
9231	9231	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
9232		-** <dd>This parameter returns the number malloc attempts that might have
	9232	+** <dd>This parameter returns the number of malloc attempts that might have
9233	9233	** been satisfied using lookaside memory but failed due to the amount of
9234	9234	** memory requested being larger than the lookaside slot size.
9235	9235	** Only the high-water value is meaningful;
9236		-** the current value is always zero.)^
	9236	+** the current value is always zero.</dd>)^
9237	9237	**
9238	9238	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
9239	9239	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
9240		-** <dd>This parameter returns the number malloc attempts that might have
	9240	+** <dd>This parameter returns the number of malloc attempts that might have
9241	9241	** been satisfied using lookaside memory but failed due to all lookaside
9242	9242	** memory already being in use.
9243	9243	** Only the high-water value is meaningful;
9244		-** the current value is always zero.)^
	9244	+** the current value is always zero.</dd>)^
9245	9245	**
9246	9246	** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
9247	9247	** <dd>This parameter returns the approximate number of bytes of heap
9248	9248	** memory used by all pager caches associated with the database connection.)^
9249	9249	** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
	9250	+** </dd>
9250	9251	**
9251	9252	** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
9252	9253	** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
9253	9254	** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
9254	9255	** pager cache is shared between two or more connections the bytes of heap
9255	9256	** memory used by that pager cache is divided evenly between the attached
9256	9257	** connections.)^ In other words, if none of the pager caches associated
9257	9258	** with the database connection are shared, this request returns the same
9258		-** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are
	9259	+** value as DBSTATUS_CACHE_USED. Or, if one or more of the pager caches are
9259	9260	** shared, the value returned by this call will be smaller than that returned
9260	9261	** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
9261		-** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.
	9262	+** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.</dd>
9262	9263	**
9263	9264	** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
9264	9265	** <dd>This parameter returns the approximate number of bytes of heap
9265	9266	** memory used to store the schema for all databases associated
9266	9267	** with the connection - main, temp, and any [ATTACH]-ed databases.)^
9267	9268	** ^The full amount of memory used by the schemas is reported, even if the
9268	9269	** schema memory is shared with other database connections due to
9269	9270	** [shared cache mode] being enabled.
9270	9271	** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
	9272	+** </dd>
9271	9273	**
9272	9274	** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
9273	9275	** <dd>This parameter returns the approximate number of bytes of heap
9274	9276	** and lookaside memory used by all prepared statements associated with
9275	9277	** the database connection.)^
		@@ -9302,11 +9304,11 @@
9302	9304	** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
9303	9305	** <dd>This parameter returns the number of dirty cache entries that have
9304	9306	** been written to disk in the middle of a transaction due to the page
9305	9307	** cache overflowing. Transactions are more efficient if they are written
9306	9308	** to disk all at once. When pages spill mid-transaction, that introduces
9307		-** additional overhead. This parameter can be used help identify
	9309	+** additional overhead. This parameter can be used to help identify
9308	9310	** inefficiencies that can be resolved by increasing the cache size.
9309	9311	** </dd>
9310	9312	**
9311	9313	** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
9312	9314	** <dd>This parameter returns zero for the current value if and only if
		@@ -9373,48 +9375,48 @@
9373	9375	** careful use of indices.</dd>
9374	9376	**
9375	9377	** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
9376	9378	** <dd>^This is the number of sort operations that have occurred.
9377	9379	** A non-zero value in this counter may indicate an opportunity to
9378		-** improvement performance through careful use of indices.</dd>
	9380	+** improve performance through careful use of indices.</dd>
9379	9381	**
9380	9382	** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
9381	9383	** <dd>^This is the number of rows inserted into transient indices that
9382	9384	** were created automatically in order to help joins run faster.
9383	9385	** A non-zero value in this counter may indicate an opportunity to
9384		-** improvement performance by adding permanent indices that do not
	9386	+** improve performance by adding permanent indices that do not
9385	9387	** need to be reinitialized each time the statement is run.</dd>
9386	9388	**
9387	9389	** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
9388	9390	** <dd>^This is the number of virtual machine operations executed
9389	9391	** by the prepared statement if that number is less than or equal
9390	9392	** to 2147483647. The number of virtual machine operations can be
9391	9393	** used as a proxy for the total work done by the prepared statement.
9392	9394	** If the number of virtual machine operations exceeds 2147483647
9393		-** then the value returned by this statement status code is undefined.
	9395	+** then the value returned by this statement status code is undefined.</dd>
9394	9396	**
9395	9397	** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
9396	9398	** <dd>^This is the number of times that the prepare statement has been
9397	9399	** automatically regenerated due to schema changes or changes to
9398		-** [bound parameters] that might affect the query plan.
	9400	+** [bound parameters] that might affect the query plan.</dd>
9399	9401	**
9400	9402	** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
9401	9403	** <dd>^This is the number of times that the prepared statement has
9402	9404	** been run. A single "run" for the purposes of this counter is one
9403	9405	** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
9404	9406	** The counter is incremented on the first [sqlite3_step()] call of each
9405		-** cycle.
	9407	+** cycle.</dd>
9406	9408	**
9407	9409	** [[SQLITE_STMTSTATUS_FILTER_MISS]]
9408	9410	** [[SQLITE_STMTSTATUS_FILTER HIT]]
9409	9411	** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
9410	9412	** SQLITE_STMTSTATUS_FILTER_MISS</dt>
9411	9413	** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
9412	9414	** step was bypassed because a Bloom filter returned not-found. The
9413	9415	** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
9414	9416	** times that the Bloom filter returned a find, and thus the join step
9415		-** had to be processed as normal.
	9417	+** had to be processed as normal.</dd>
9416	9418	**
9417	9419	** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
9418	9420	** <dd>^This is the approximate number of bytes of heap memory
9419	9421	** used to store the prepared statement. ^This value is not actually
9420	9422	** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
		@@ -9515,31 +9517,31 @@
9515	9517	** [[the xCreate() page cache methods]]
9516	9518	** ^SQLite invokes the xCreate() method to construct a new cache instance.
9517	9519	** SQLite will typically create one cache instance for each open database file,
9518	9520	** though this is not guaranteed. ^The
9519	9521	** first parameter, szPage, is the size in bytes of the pages that must
9520		-** be allocated by the cache. ^szPage will always a power of two. ^The
	9522	+** be allocated by the cache. ^szPage will always be a power of two. ^The
9521	9523	** second parameter szExtra is a number of bytes of extra storage
9522		-** associated with each page cache entry. ^The szExtra parameter will
	9524	+** associated with each page cache entry. ^The szExtra parameter will be
9523	9525	** a number less than 250. SQLite will use the
9524	9526	** extra szExtra bytes on each page to store metadata about the underlying
9525	9527	** database page on disk. The value passed into szExtra depends
9526	9528	** on the SQLite version, the target platform, and how SQLite was compiled.
9527	9529	** ^The third argument to xCreate(), bPurgeable, is true if the cache being
9528	9530	** created will be used to cache database pages of a file stored on disk, or
9529	9531	** false if it is used for an in-memory database. The cache implementation
9530		-** does not have to do anything special based with the value of bPurgeable;
	9532	+** does not have to do anything special based upon the value of bPurgeable;
9531	9533	** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
9532	9534	** never invoke xUnpin() except to deliberately delete a page.
9533	9535	** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
9534	9536	** false will always have the "discard" flag set to true.
9535		-** ^Hence, a cache created with bPurgeable false will
	9537	+** ^Hence, a cache created with bPurgeable set to false will
9536	9538	** never contain any unpinned pages.
9537	9539	**
9538	9540	** [[the xCachesize() page cache method]]
9539	9541	** ^(The xCachesize() method may be called at any time by SQLite to set the
9540		-** suggested maximum cache-size (number of pages stored by) the cache
	9542	+** suggested maximum cache-size (number of pages stored) for the cache
9541	9543	** instance passed as the first argument. This is the value configured using
9542	9544	** the SQLite "[PRAGMA cache_size]" command.)^ As with the bPurgeable
9543	9545	** parameter, the implementation is not required to do anything with this
9544	9546	** value; it is advisory only.
9545	9547	**
		@@ -9562,16 +9564,16 @@
9562	9564	**
9563	9565	** If the requested page is already in the page cache, then the page cache
9564	9566	** implementation must return a pointer to the page buffer with its content
9565	9567	** intact. If the requested page is not already in the cache, then the
9566	9568	** cache implementation should use the value of the createFlag
9567		-** parameter to help it determined what action to take:
	9569	+** parameter to help it determine what action to take:
9568	9570	**
9569	9571	** <table border=1 width=85% align=center>
9570	9572	** <tr><th> createFlag <th> Behavior when page is not already in cache
9571	9573	** <tr><td> 0 <td> Do not allocate a new page. Return NULL.
9572		-** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
	9574	+** <tr><td> 1 <td> Allocate a new page if it is easy and convenient to do so.
9573	9575	** Otherwise return NULL.
9574	9576	** <tr><td> 2 <td> Make every effort to allocate a new page. Only return
9575	9577	** NULL if allocating a new page is effectively impossible.
9576	9578	** </table>
9577	9579	**
		@@ -9584,11 +9586,11 @@
9584	9586	** [[the xUnpin() page cache method]]
9585	9587	** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
9586	9588	** as its second argument. If the third parameter, discard, is non-zero,
9587	9589	** then the page must be evicted from the cache.
9588	9590	** ^If the discard parameter is
9589		-** zero, then the page may be discarded or retained at the discretion of
	9591	+** zero, then the page may be discarded or retained at the discretion of the
9590	9592	** page cache implementation. ^The page cache implementation
9591	9593	** may choose to evict unpinned pages at any time.
9592	9594	**
9593	9595	** The cache must not perform any reference counting. A single
9594	9596	** call to xUnpin() unpins the page regardless of the number of prior calls
		@@ -9602,11 +9604,11 @@
9602	9604	** to be pinned.
9603	9605	**
9604	9606	** When SQLite calls the xTruncate() method, the cache must discard all
9605	9607	** existing cache entries with page numbers (keys) greater than or equal
9606	9608	** to the value of the iLimit parameter passed to xTruncate(). If any
9607		-** of these pages are pinned, they are implicitly unpinned, meaning that
	9609	+** of these pages are pinned, they become implicitly unpinned, meaning that
9608	9610	** they can be safely discarded.
9609	9611	**
9610	9612	** [[the xDestroy() page cache method]]
9611	9613	** ^The xDestroy() method is used to delete a cache allocated by xCreate().
9612	9614	** All resources associated with the specified cache should be freed. ^After
		@@ -9782,11 +9784,11 @@
9782	9784	** sqlite3_backup_step(), the source database may be modified mid-way
9783	9785	** through the backup process. ^If the source database is modified by an
9784	9786	** external process or via a database connection other than the one being
9785	9787	** used by the backup operation, then the backup will be automatically
9786	9788	** restarted by the next call to sqlite3_backup_step(). ^If the source
9787		-** database is modified by the using the same database connection as is used
	9789	+** database is modified by using the same database connection as is used
9788	9790	** by the backup operation, then the backup database is automatically
9789	9791	** updated at the same time.
9790	9792	**
9791	9793	** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
9792	9794	**
		@@ -9799,11 +9801,11 @@
9799	9801	** active write-transaction on the destination database is rolled back.
9800	9802	** The [sqlite3_backup] object is invalid
9801	9803	** and may not be used following a call to sqlite3_backup_finish().
9802	9804	**
9803	9805	** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
9804		-** sqlite3_backup_step() errors occurred, regardless or whether or not
	9806	+** sqlite3_backup_step() errors occurred, regardless of whether or not
9805	9807	** sqlite3_backup_step() completed.
9806	9808	** ^If an out-of-memory condition or IO error occurred during any prior
9807	9809	** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
9808	9810	** sqlite3_backup_finish() returns the corresponding [error code].
9809	9811	**
		@@ -9901,11 +9903,11 @@
9901	9903	** identity of the database connection (the blocking connection) that
9902	9904	** has locked the required resource is stored internally. ^After an
9903	9905	** application receives an SQLITE_LOCKED error, it may call the
9904	9906	** sqlite3_unlock_notify() method with the blocked connection handle as
9905	9907	** the first argument to register for a callback that will be invoked
9906		-** when the blocking connections current transaction is concluded. ^The
	9908	+** when the blocking connection's current transaction is concluded. ^The
9907	9909	** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
9908	9910	** call that concludes the blocking connection's transaction.
9909	9911	**
9910	9912	** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
9911	9913	** there is a chance that the blocking connection will have already
		@@ -9921,11 +9923,11 @@
9921	9923	** ^(There may be at most one unlock-notify callback registered by a
9922	9924	** blocked connection. If sqlite3_unlock_notify() is called when the
9923	9925	** blocked connection already has a registered unlock-notify callback,
9924	9926	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
9925	9927	** called with a NULL pointer as its second argument, then any existing
9926		-** unlock-notify callback is canceled. ^The blocked connections
	9928	+** unlock-notify callback is canceled. ^The blocked connection's
9927	9929	** unlock-notify callback may also be canceled by closing the blocked
9928	9930	** connection using [sqlite3_close()].
9929	9931	**
9930	9932	** The unlock-notify callback is not reentrant. If an application invokes
9931	9933	** any sqlite3_xxx API functions from within an unlock-notify callback, a
		@@ -10319,11 +10321,11 @@
10319	10321	** where X is an integer. If X is zero, then the [virtual table] whose
10320	10322	** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
10321	10323	** support constraints. In this configuration (which is the default) if
10322	10324	** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
10323	10325	** statement is rolled back as if [ON CONFLICT \| OR ABORT] had been
10324		-** specified as part of the users SQL statement, regardless of the actual
	10326	+** specified as part of the user's SQL statement, regardless of the actual
10325	10327	** ON CONFLICT mode specified.
10326	10328	**
10327	10329	** If X is non-zero, then the virtual table implementation guarantees
10328	10330	** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
10329	10331	** any modifications to internal or persistent data structures have been made.
		@@ -10353,11 +10355,11 @@
10353	10355	** </dd>
10354	10356	**
10355	10357	** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
10356	10358	** <dd>Calls of the form
10357	10359	** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
10358		-** the [xConnect] or [xCreate] methods of a [virtual table] implementation
	10360	+** [xConnect] or [xCreate] methods of a [virtual table] implementation
10359	10361	** identify that virtual table as being safe to use from within triggers
10360	10362	** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
10361	10363	** virtual table can do no serious harm even if it is controlled by a
10362	10364	** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
10363	10365	** flag unless absolutely necessary.
		@@ -10521,21 +10523,21 @@
10521	10523	** <tr><td>2<td>no<td>yes<td>yes
10522	10524	** <tr><td>3<td>yes<td>yes<td>yes
10523	10525	** </table>
10524	10526	**
10525	10527	** ^For the purposes of comparing virtual table output values to see if the
10526		-** values are same value for sorting purposes, two NULL values are considered
	10528	+** values are the same value for sorting purposes, two NULL values are considered
10527	10529	** to be the same. In other words, the comparison operator is "IS"
10528	10530	** (or "IS NOT DISTINCT FROM") and not "==".
10529	10531	**
10530	10532	** If a virtual table implementation is unable to meet the requirements
10531	10533	** specified above, then it must not set the "orderByConsumed" flag in the
10532	10534	** [sqlite3_index_info] object or an incorrect answer may result.
10533	10535	**
10534	10536	** ^A virtual table implementation is always free to return rows in any order
10535	10537	** it wants, as long as the "orderByConsumed" flag is not set. ^When the
10536		-** the "orderByConsumed" flag is unset, the query planner will add extra
	10538	+** "orderByConsumed" flag is unset, the query planner will add extra
10537	10539	** [bytecode] to ensure that the final results returned by the SQL query are
10538	10540	** ordered correctly. The use of the "orderByConsumed" flag and the
10539	10541	** sqlite3_vtab_distinct() interface is merely an optimization. ^Careful
10540	10542	** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
10541	10543	** flag might help queries against a virtual table to run faster. Being
		@@ -10628,11 +10630,11 @@
10628	10630	**
10629	10631	** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
10630	10632	** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
10631	10633	** xFilter method which invokes these routines, and specifically
10632	10634	** a parameter that was previously selected for all-at-once IN constraint
10633		-** processing use the [sqlite3_vtab_in()] interface in the
	10635	+** processing using the [sqlite3_vtab_in()] interface in the
10634	10636	** [xBestIndex\|xBestIndex method]. ^(If the X parameter is not
10635	10637	** an xFilter argument that was selected for all-at-once IN constraint
10636	10638	** processing, then these routines return [SQLITE_ERROR].)^
10637	10639	**
10638	10640	** ^(Use these routines to access all values on the right-hand side
		@@ -10683,11 +10685,11 @@
10683	10685	** right-hand operand is not known, then *V is set to a NULL pointer.
10684	10686	** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
10685	10687	** and only if *V is set to a value. ^The sqlite3_vtab_rhs_value(P,J,V)
10686	10688	** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
10687	10689	** constraint is not available. ^The sqlite3_vtab_rhs_value() interface
10688		-** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
	10690	+** can return a result code other than SQLITE_OK or SQLITE_NOTFOUND if
10689	10691	** something goes wrong.
10690	10692	**
10691	10693	** The sqlite3_vtab_rhs_value() interface is usually only successful if
10692	10694	** the right-hand operand of a constraint is a literal value in the original
10693	10695	** SQL statement. If the right-hand operand is an expression or a reference
		@@ -10711,12 +10713,12 @@
10711	10713	/*
10712	10714	** CAPI3REF: Conflict resolution modes
10713	10715	** KEYWORDS: {conflict resolution mode}
10714	10716	**
10715	10717	** These constants are returned by [sqlite3_vtab_on_conflict()] to
10716		-** inform a [virtual table] implementation what the [ON CONFLICT] mode
10717		-** is for the SQL statement being evaluated.
	10718	+** inform a [virtual table] implementation of the [ON CONFLICT] mode
	10719	+** for the SQL statement being evaluated.
10718	10720	**
10719	10721	** Note that the [SQLITE_IGNORE] constant is also used as a potential
10720	10722	** return value from the [sqlite3_set_authorizer()] callback and that
10721	10723	** [SQLITE_ABORT] is also a [result code].
10722	10724	*/
		@@ -10752,43 +10754,43 @@
10752	10754	** to the total number of rows examined by all iterations of the X-th loop.</dd>
10753	10755	**
10754	10756	** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
10755	10757	** <dd>^The "double" variable pointed to by the V parameter will be set to the
10756	10758	** query planner's estimate for the average number of rows output from each
10757		-** iteration of the X-th loop. If the query planner's estimates was accurate,
	10759	+** iteration of the X-th loop. If the query planner's estimate was accurate,
10758	10760	** then this value will approximate the quotient NVISIT/NLOOP and the
10759	10761	** product of this value for all prior loops with the same SELECTID will
10760		-** be the NLOOP value for the current loop.
	10762	+** be the NLOOP value for the current loop.</dd>
10761	10763	**
10762	10764	** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
10763	10765	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10764	10766	** to a zero-terminated UTF-8 string containing the name of the index or table
10765		-** used for the X-th loop.
	10767	+** used for the X-th loop.</dd>
10766	10768	**
10767	10769	** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
10768	10770	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10769	10771	** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
10770		-** description for the X-th loop.
	10772	+** description for the X-th loop.</dd>
10771	10773	**
10772	10774	** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
10773	10775	** <dd>^The "int" variable pointed to by the V parameter will be set to the
10774	10776	** id for the X-th query plan element. The id value is unique within the
10775	10777	** statement. The select-id is the same value as is output in the first
10776		-** column of an [EXPLAIN QUERY PLAN] query.
	10778	+** column of an [EXPLAIN QUERY PLAN] query.</dd>
10777	10779	**
10778	10780	** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
10779	10781	** <dd>The "int" variable pointed to by the V parameter will be set to the
10780		-** the id of the parent of the current query element, if applicable, or
	10782	+** id of the parent of the current query element, if applicable, or
10781	10783	** to zero if the query element has no parent. This is the same value as
10782		-** returned in the second column of an [EXPLAIN QUERY PLAN] query.
	10784	+** returned in the second column of an [EXPLAIN QUERY PLAN] query.</dd>
10783	10785	**
10784	10786	** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
10785	10787	** <dd>The sqlite3_int64 output value is set to the number of cycles,
10786	10788	** according to the processor time-stamp counter, that elapsed while the
10787	10789	** query element was being processed. This value is not available for
10788	10790	** all query elements - if it is unavailable the output variable is
10789		-** set to -1.
	10791	+** set to -1.</dd>
10790	10792	** </dl>
10791	10793	*/
10792	10794	#define SQLITE_SCANSTAT_NLOOP 0
10793	10795	#define SQLITE_SCANSTAT_NVISIT 1
10794	10796	#define SQLITE_SCANSTAT_EST 2
		@@ -10825,12 +10827,12 @@
10825	10827	** the EXPLAIN QUERY PLAN output) are available. Invoking API
10826	10828	** sqlite3_stmt_scanstatus() is equivalent to calling
10827	10829	** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
10828	10830	**
10829	10831	** Parameter "idx" identifies the specific query element to retrieve statistics
10830		-** for. Query elements are numbered starting from zero. A value of -1 may be
10831		-** to query for statistics regarding the entire query. ^If idx is out of range
	10832	+** for. Query elements are numbered starting from zero. A value of -1 may
	10833	+** retrieve statistics for the entire query. ^If idx is out of range
10832	10834	** - less than -1 or greater than or equal to the total number of query
10833	10835	** elements used to implement the statement - a non-zero value is returned and
10834	10836	** the variable that pOut points to is unchanged.
10835	10837	**
10836	10838	** See also: [sqlite3_stmt_scanstatus_reset()]
		@@ -10869,11 +10871,11 @@
10869	10871	/*
10870	10872	** CAPI3REF: Flush caches to disk mid-transaction
10871	10873	** METHOD: sqlite3
10872	10874	**
10873	10875	** ^If a write-transaction is open on [database connection] D when the
10874		-** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
	10876	+** [sqlite3_db_cacheflush(D)] interface is invoked, any dirty
10875	10877	** pages in the pager-cache that are not currently in use are written out
10876	10878	** to disk. A dirty page may be in use if a database cursor created by an
10877	10879	** active SQL statement is reading from it, or if it is page 1 of a database
10878	10880	** file (page 1 is always "in use"). ^The [sqlite3_db_cacheflush(D)]
10879	10881	** interface flushes caches for all schemas - "main", "temp", and
		@@ -10983,12 +10985,12 @@
10983	10985	** operation; or 1 for inserts, updates, or deletes invoked by top-level
10984	10986	** triggers; or 2 for changes resulting from triggers called by top-level
10985	10987	** triggers; and so forth.
10986	10988	**
10987	10989	** When the [sqlite3_blob_write()] API is used to update a blob column,
10988		-** the pre-update hook is invoked with SQLITE_DELETE. This is because the
10989		-** in this case the new values are not available. In this case, when a
	10990	+** the pre-update hook is invoked with SQLITE_DELETE, because
	10991	+** the new values are not yet available. In this case, when a
10990	10992	** callback made with op==SQLITE_DELETE is actually a write using the
10991	10993	** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
10992	10994	** the index of the column being written. In other cases, where the
10993	10995	** pre-update hook is being invoked for some other reason, including a
10994	10996	** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
		@@ -11237,20 +11239,20 @@
11237	11239	** is written into *P.
11238	11240	**
11239	11241	** For an ordinary on-disk database file, the serialization is just a
11240	11242	** copy of the disk file. For an in-memory database or a "TEMP" database,
11241	11243	** the serialization is the same sequence of bytes which would be written
11242		-** to disk if that database where backed up to disk.
	11244	+** to disk if that database were backed up to disk.
11243	11245	**
11244	11246	** The usual case is that sqlite3_serialize() copies the serialization of
11245	11247	** the database into memory obtained from [sqlite3_malloc64()] and returns
11246	11248	** a pointer to that memory. The caller is responsible for freeing the
11247	11249	** returned value to avoid a memory leak. However, if the F argument
11248	11250	** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
11249	11251	** are made, and the sqlite3_serialize() function will return a pointer
11250	11252	** to the contiguous memory representation of the database that SQLite
11251		-** is currently using for that database, or NULL if the no such contiguous
	11253	+** is currently using for that database, or NULL if no such contiguous
11252	11254	** memory representation of the database exists. A contiguous memory
11253	11255	** representation of the database will usually only exist if there has
11254	11256	** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
11255	11257	** values of D and S.
11256	11258	** The size of the database is written into *P even if the
		@@ -11317,11 +11319,11 @@
11317	11319	**
11318	11320	** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
11319	11321	** database is currently in a read transaction or is involved in a backup
11320	11322	** operation.
11321	11323	**
11322		-** It is not possible to deserialized into the TEMP database. If the
	11324	+** It is not possible to deserialize into the TEMP database. If the
11323	11325	** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
11324	11326	** function returns SQLITE_ERROR.
11325	11327	**
11326	11328	** The deserialized database should not be in [WAL mode]. If the database
11327	11329	** is in WAL mode, then any attempt to use the database file will result
		@@ -11339,19 +11341,19 @@
11339	11341	*/
11340	11342	SQLITE_API int sqlite3_deserialize(
11341	11343	sqlite3 db, / The database connection */
11342	11344	const char zSchema, / Which DB to reopen with the deserialization */
11343	11345	unsigned char pData, / The serialized database content */
11344		- sqlite3_int64 szDb, /* Number bytes in the deserialization */
	11346	+ sqlite3_int64 szDb, /* Number of bytes in the deserialization */
11345	11347	sqlite3_int64 szBuf, /* Total size of buffer pData[] */
11346	11348	unsigned mFlags /* Zero or more SQLITE_DESERIALIZE_* flags */
11347	11349	);
11348	11350
11349	11351	/*
11350	11352	** CAPI3REF: Flags for sqlite3_deserialize()
11351	11353	**
11352		-** The following are allowed values for 6th argument (the F argument) to
	11354	+** The following are allowed values for the 6th argument (the F argument) to
11353	11355	** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
11354	11356	**
11355	11357	** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
11356	11358	** in the P argument is held in memory obtained from [sqlite3_malloc64()]
11357	11359	** and that SQLite should take ownership of this memory and automatically
		@@ -11872,13 +11874,14 @@
11872	11874	** This may appear to have some counter-intuitive effects if a single row
11873	11875	** is written to more than once during a session. For example, if a row
11874	11876	** is inserted while a session object is enabled, then later deleted while
11875	11877	** the same session object is disabled, no INSERT record will appear in the
11876	11878	** changeset, even though the delete took place while the session was disabled.
11877		-** Or, if one field of a row is updated while a session is disabled, and
11878		-** another field of the same row is updated while the session is enabled, the
11879		-** resulting changeset will contain an UPDATE change that updates both fields.
	11879	+** Or, if one field of a row is updated while a session is enabled, and
	11880	+** then another field of the same row is updated while the session is disabled,
	11881	+** the resulting changeset will contain an UPDATE change that updates both
	11882	+** fields.
11880	11883	*/
11881	11884	SQLITE_API int sqlite3session_changeset(
11882	11885	sqlite3_session pSession, / Session object */
11883	11886	int pnChangeset, / OUT: Size of buffer at ppChangeset /
11884	11887	void *ppChangeset / OUT: Buffer containing changeset */
		@@ -12083,11 +12086,11 @@
12083	12086	** CAPI3REF: Flags for sqlite3changeset_start_v2
12084	12087	**
12085	12088	** The following flags may passed via the 4th parameter to
12086	12089	** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
12087	12090	**
12088		-** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
	12091	+** <dt>SQLITE_CHANGESETSTART_INVERT <dd>
12089	12092	** Invert the changeset while iterating through it. This is equivalent to
12090	12093	** inverting a changeset using sqlite3changeset_invert() before applying it.
12091	12094	** It is an error to specify this flag with a patchset.
12092	12095	*/
12093	12096	#define SQLITE_CHANGESETSTART_INVERT 0x0002
		@@ -12628,17 +12631,26 @@
12628	12631	** Apply a changeset or patchset to a database. These functions attempt to
12629	12632	** update the "main" database attached to handle db with the changes found in
12630	12633	** the changeset passed via the second and third arguments.
12631	12634	**
12632	12635	** The fourth argument (xFilter) passed to these functions is the "filter
12633		-** callback". If it is not NULL, then for each table affected by at least one
12634		-** change in the changeset, the filter callback is invoked with
12635		-** the table name as the second argument, and a copy of the context pointer
12636		-** passed as the sixth argument as the first. If the "filter callback"
12637		-** returns zero, then no attempt is made to apply any changes to the table.
12638		-** Otherwise, if the return value is non-zero or the xFilter argument to
12639		-** is NULL, all changes related to the table are attempted.
	12636	+** callback". This may be passed NULL, in which case all changes in the
	12637	+** changeset are applied to the database. For sqlite3changeset_apply() and
	12638	+** sqlite3_changeset_apply_v2(), if it is not NULL, then it is invoked once
	12639	+** for each table affected by at least one change in the changeset. In this
	12640	+** case the table name is passed as the second argument, and a copy of
	12641	+** the context pointer passed as the sixth argument to apply() or apply_v2()
	12642	+** as the first. If the "filter callback" returns zero, then no attempt is
	12643	+** made to apply any changes to the table. Otherwise, if the return value is
	12644	+** non-zero, all changes related to the table are attempted.
	12645	+**
	12646	+** For sqlite3_changeset_apply_v3(), the xFilter callback is invoked once
	12647	+** per change. The second argument in this case is an sqlite3_changeset_iter
	12648	+** that may be queried using the usual APIs for the details of the current
	12649	+** change. If the "filter callback" returns zero in this case, then no attempt
	12650	+** is made to apply the current change. If it returns non-zero, the change
	12651	+** is applied.
12640	12652	**
12641	12653	** For each table that is not excluded by the filter callback, this function
12642	12654	** tests that the target database contains a compatible table. A table is
12643	12655	** considered compatible if all of the following are true:
12644	12656	**
		@@ -12655,15 +12667,15 @@
12655	12667	** changes associated with the table are applied. A warning message is issued
12656	12668	** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
12657	12669	** one such warning is issued for each table in the changeset.
12658	12670	**
12659	12671	** For each change for which there is a compatible table, an attempt is made
12660		-** to modify the table contents according to the UPDATE, INSERT or DELETE
12661		-** change. If a change cannot be applied cleanly, the conflict handler
12662		-** function passed as the fifth argument to sqlite3changeset_apply() may be
12663		-** invoked. A description of exactly when the conflict handler is invoked for
12664		-** each type of change is below.
	12672	+** to modify the table contents according to each UPDATE, INSERT or DELETE
	12673	+** change that is not excluded by a filter callback. If a change cannot be
	12674	+** applied cleanly, the conflict handler function passed as the fifth argument
	12675	+** to sqlite3changeset_apply() may be invoked. A description of exactly when
	12676	+** the conflict handler is invoked for each type of change is below.
12665	12677	**
12666	12678	** Unlike the xFilter argument, xConflict may not be passed NULL. The results
12667	12679	** of passing anything other than a valid function pointer as the xConflict
12668	12680	** argument are undefined.
12669	12681	**
		@@ -12801,10 +12813,27 @@
12801	12813	void pChangeset, / Changeset blob */
12802	12814	int(*xFilter)(
12803	12815	void pCtx, / Copy of sixth arg to _apply() */
12804	12816	const char zTab / Table name */
12805	12817	),
	12818	+ int(*xConflict)(
	12819	+ void pCtx, / Copy of sixth arg to _apply() */
	12820	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	12821	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	12822	+ ),
	12823	+ void pCtx, / First argument passed to xConflict */
	12824	+ void *ppRebase, int pnRebase, /* OUT: Rebase data */
	12825	+ int flags /* SESSION_CHANGESETAPPLY_* flags */
	12826	+);
	12827	+SQLITE_API int sqlite3changeset_apply_v3(
	12828	+ sqlite3 db, / Apply change to "main" db of this handle */
	12829	+ int nChangeset, /* Size of changeset in bytes */
	12830	+ void pChangeset, / Changeset blob */
	12831	+ int(*xFilter)(
	12832	+ void pCtx, / Copy of sixth arg to _apply() */
	12833	+ sqlite3_changeset_iter p / Handle describing change */
	12834	+ ),
12806	12835	int(*xConflict)(
12807	12836	void pCtx, / Copy of sixth arg to _apply() */
12808	12837	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12809	12838	sqlite3_changeset_iter p / Handle describing change and conflict */
12810	12839	),
		@@ -13220,10 +13249,27 @@
13220	13249	void pIn, / First arg for xInput */
13221	13250	int(*xFilter)(
13222	13251	void pCtx, / Copy of sixth arg to _apply() */
13223	13252	const char zTab / Table name */
13224	13253	),
	13254	+ int(*xConflict)(
	13255	+ void pCtx, / Copy of sixth arg to _apply() */
	13256	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	13257	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	13258	+ ),
	13259	+ void pCtx, / First argument passed to xConflict */
	13260	+ void *ppRebase, int pnRebase,
	13261	+ int flags
	13262	+);
	13263	+SQLITE_API int sqlite3changeset_apply_v3_strm(
	13264	+ sqlite3 db, / Apply change to "main" db of this handle */
	13265	+ int (xInput)(void pIn, void pData, int pnData), /* Input function */
	13266	+ void pIn, / First arg for xInput */
	13267	+ int(*xFilter)(
	13268	+ void pCtx, / Copy of sixth arg to _apply() */
	13269	+ sqlite3_changeset_iter *p
	13270	+ ),
13225	13271	int(*xConflict)(
13226	13272	void pCtx, / Copy of sixth arg to _apply() */
13227	13273	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
13228	13274	sqlite3_changeset_iter p / Handle describing change and conflict */
13229	13275	),
		@@ -15173,11 +15219,11 @@
15173	15219	/*
15174	15220	** GCC does not define the offsetof() macro so we'll have to do it
15175	15221	** ourselves.
15176	15222	*/
15177	15223	#ifndef offsetof
15178		-#define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
	15224	+# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
15179	15225	#endif
15180	15226
15181	15227	/*
15182	15228	** Work around C99 "flex-array" syntax for pre-C99 compilers, so as
15183	15229	** to avoid complaints from -fsanitize=strict-bounds.
		@@ -15439,12 +15485,12 @@
15439	15485	/*
15440	15486	** Macro SMXV(n) return the maximum value that can be held in variable n,
15441	15487	** assuming n is a signed integer type. UMXV(n) is similar for unsigned
15442	15488	** integer types.
15443	15489	*/
15444		-#define SMXV(n) ((((i64)1)<<(sizeof(n)-1))-1)
15445		-#define UMXV(n) ((((i64)1)<<(sizeof(n)))-1)
	15490	+#define SMXV(n) ((((i64)1)<<(sizeof(n)*8-1))-1)
	15491	+#define UMXV(n) ((((i64)1)<<(sizeof(n)*8))-1)
15446	15492
15447	15493	/*
15448	15494	** Round up a number to the next larger multiple of 8. This is used
15449	15495	** to force 8-byte alignment on 64-bit architectures.
15450	15496	**
		@@ -15561,10 +15607,12 @@
15561	15607	** 0x00008000 After all FROM-clause analysis
15562	15608	** 0x00010000 Beginning of DELETE/INSERT/UPDATE processing
15563	15609	** 0x00020000 Transform DISTINCT into GROUP BY
15564	15610	** 0x00040000 SELECT tree dump after all code has been generated
15565	15611	** 0x00080000 NOT NULL strength reduction
	15612	+** 0x00100000 Pointers are all shown as zero
	15613	+** 0x00200000 EXISTS-to-JOIN optimization
15566	15614	*/
15567	15615
15568	15616	/*
15569	15617	** Macros for "wheretrace"
15570	15618	*/
		@@ -15605,10 +15653,11 @@
15605	15653	**
15606	15654	** 0x00010000 Show more detail when printing WHERE terms
15607	15655	** 0x00020000 Show WHERE terms returned from whereScanNext()
15608	15656	** 0x00040000 Solver overview messages
15609	15657	** 0x00080000 Star-query heuristic
	15658	+** 0x00100000 Pointers are all shown as zero
15610	15659	*/
15611	15660
15612	15661
15613	15662	/*
15614	15663	** An instance of the following structure is used to store the busy-handler
		@@ -15677,11 +15726,11 @@
15677	15726	** one parameter that destructors normally want. So we have to introduce
15678	15727	** this magic value that the code knows to handle differently. Any
15679	15728	** pointer will work here as long as it is distinct from SQLITE_STATIC
15680	15729	** and SQLITE_TRANSIENT.
15681	15730	*/
15682		-#define SQLITE_DYNAMIC ((sqlite3_destructor_type)sqlite3OomClear)
	15731	+#define SQLITE_DYNAMIC ((sqlite3_destructor_type)sqlite3RowSetClear)
15683	15732
15684	15733	/*
15685	15734	** When SQLITE_OMIT_WSD is defined, it means that the target platform does
15686	15735	** not support Writable Static Data (WSD) such as global and static variables.
15687	15736	** All variables must either be on the stack or dynamically allocated from
		@@ -16745,10 +16794,11 @@
16745	16794	};
16746	16795
16747	16796	SQLITE_PRIVATE int sqlite3BtreeInsert(BtCursor, const BtreePayload pPayload,
16748	16797	int flags, int seekResult);
16749	16798	SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor, int pRes);
	16799	+SQLITE_PRIVATE int sqlite3BtreeIsEmpty(BtCursor pCur, int pRes);
16750	16800	SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor, int pRes);
16751	16801	SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor*, int flags);
16752	16802	SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor*);
16753	16803	SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int flags);
16754	16804	SQLITE_PRIVATE i64 sqlite3BtreeIntegerKey(BtCursor*);
		@@ -17078,76 +17128,76 @@
17078	17128	#define OP_Last 32 /* jump0 */
17079	17129	#define OP_IfSizeBetween 33 /* jump */
17080	17130	#define OP_SorterSort 34 /* jump */
17081	17131	#define OP_Sort 35 /* jump */
17082	17132	#define OP_Rewind 36 /* jump0 */
17083		-#define OP_SorterNext 37 /* jump */
17084		-#define OP_Prev 38 /* jump */
17085		-#define OP_Next 39 /* jump */
17086		-#define OP_IdxLE 40 /* jump, synopsis: key=r[P3@P4] */
17087		-#define OP_IdxGT 41 /* jump, synopsis: key=r[P3@P4] */
17088		-#define OP_IdxLT 42 /* jump, synopsis: key=r[P3@P4] */
	17133	+#define OP_IfEmpty 37 /* jump, synopsis: if( empty(P1) ) goto P2 */
	17134	+#define OP_SorterNext 38 /* jump */
	17135	+#define OP_Prev 39 /* jump */
	17136	+#define OP_Next 40 /* jump */
	17137	+#define OP_IdxLE 41 /* jump, synopsis: key=r[P3@P4] */
	17138	+#define OP_IdxGT 42 /* jump, synopsis: key=r[P3@P4] */
17089	17139	#define OP_Or 43 /* same as TK_OR, synopsis: r[P3]=(r[P1] \|\| r[P2]) */
17090	17140	#define OP_And 44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
17091		-#define OP_IdxGE 45 /* jump, synopsis: key=r[P3@P4] */
17092		-#define OP_RowSetRead 46 /* jump, synopsis: r[P3]=rowset(P1) */
17093		-#define OP_RowSetTest 47 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
17094		-#define OP_Program 48 /* jump0 */
17095		-#define OP_FkIfZero 49 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
17096		-#define OP_IfPos 50 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
	17141	+#define OP_IdxLT 45 /* jump, synopsis: key=r[P3@P4] */
	17142	+#define OP_IdxGE 46 /* jump, synopsis: key=r[P3@P4] */
	17143	+#define OP_RowSetRead 47 /* jump, synopsis: r[P3]=rowset(P1) */
	17144	+#define OP_RowSetTest 48 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
	17145	+#define OP_Program 49 /* jump0 */
	17146	+#define OP_FkIfZero 50 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
17097	17147	#define OP_IsNull 51 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
17098	17148	#define OP_NotNull 52 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
17099	17149	#define OP_Ne 53 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
17100	17150	#define OP_Eq 54 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
17101	17151	#define OP_Gt 55 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
17102	17152	#define OP_Le 56 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
17103	17153	#define OP_Lt 57 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
17104	17154	#define OP_Ge 58 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
17105	17155	#define OP_ElseEq 59 /* jump, same as TK_ESCAPE */
17106		-#define OP_IfNotZero 60 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
17107		-#define OP_DecrJumpZero 61 /* jump, synopsis: if (--r[P1])==0 goto P2 */
17108		-#define OP_IncrVacuum 62 /* jump */
17109		-#define OP_VNext 63 /* jump */
17110		-#define OP_Filter 64 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
17111		-#define OP_PureFunc 65 /* synopsis: r[P3]=func(r[P2@NP]) */
17112		-#define OP_Function 66 /* synopsis: r[P3]=func(r[P2@NP]) */
17113		-#define OP_Return 67
17114		-#define OP_EndCoroutine 68
17115		-#define OP_HaltIfNull 69 /* synopsis: if r[P3]=null halt */
17116		-#define OP_Halt 70
17117		-#define OP_Integer 71 /* synopsis: r[P2]=P1 */
17118		-#define OP_Int64 72 /* synopsis: r[P2]=P4 */
17119		-#define OP_String 73 /* synopsis: r[P2]='P4' (len=P1) */
17120		-#define OP_BeginSubrtn 74 /* synopsis: r[P2]=NULL */
17121		-#define OP_Null 75 /* synopsis: r[P2..P3]=NULL */
17122		-#define OP_SoftNull 76 /* synopsis: r[P1]=NULL */
17123		-#define OP_Blob 77 /* synopsis: r[P2]=P4 (len=P1) */
17124		-#define OP_Variable 78 /* synopsis: r[P2]=parameter(P1) */
17125		-#define OP_Move 79 /* synopsis: r[P2@P3]=r[P1@P3] */
17126		-#define OP_Copy 80 /* synopsis: r[P2@P3+1]=r[P1@P3+1] */
17127		-#define OP_SCopy 81 /* synopsis: r[P2]=r[P1] */
17128		-#define OP_IntCopy 82 /* synopsis: r[P2]=r[P1] */
17129		-#define OP_FkCheck 83
17130		-#define OP_ResultRow 84 /* synopsis: output=r[P1@P2] */
17131		-#define OP_CollSeq 85
17132		-#define OP_AddImm 86 /* synopsis: r[P1]=r[P1]+P2 */
17133		-#define OP_RealAffinity 87
17134		-#define OP_Cast 88 /* synopsis: affinity(r[P1]) */
17135		-#define OP_Permutation 89
17136		-#define OP_Compare 90 /* synopsis: r[P1@P3] <-> r[P2@P3] */
17137		-#define OP_IsTrue 91 /* synopsis: r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4 */
17138		-#define OP_ZeroOrNull 92 /* synopsis: r[P2] = 0 OR NULL */
17139		-#define OP_Offset 93 /* synopsis: r[P3] = sqlite_offset(P1) */
17140		-#define OP_Column 94 /* synopsis: r[P3]=PX cursor P1 column P2 */
17141		-#define OP_TypeCheck 95 /* synopsis: typecheck(r[P1@P2]) */
17142		-#define OP_Affinity 96 /* synopsis: affinity(r[P1@P2]) */
17143		-#define OP_MakeRecord 97 /* synopsis: r[P3]=mkrec(r[P1@P2]) */
17144		-#define OP_Count 98 /* synopsis: r[P2]=count() */
17145		-#define OP_ReadCookie 99
17146		-#define OP_SetCookie 100
17147		-#define OP_ReopenIdx 101 /* synopsis: root=P2 iDb=P3 */
17148		-#define OP_OpenRead 102 /* synopsis: root=P2 iDb=P3 */
	17156	+#define OP_IfPos 60 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
	17157	+#define OP_IfNotZero 61 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
	17158	+#define OP_DecrJumpZero 62 /* jump, synopsis: if (--r[P1])==0 goto P2 */
	17159	+#define OP_IncrVacuum 63 /* jump */
	17160	+#define OP_VNext 64 /* jump */
	17161	+#define OP_Filter 65 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
	17162	+#define OP_PureFunc 66 /* synopsis: r[P3]=func(r[P2@NP]) */
	17163	+#define OP_Function 67 /* synopsis: r[P3]=func(r[P2@NP]) */
	17164	+#define OP_Return 68
	17165	+#define OP_EndCoroutine 69
	17166	+#define OP_HaltIfNull 70 /* synopsis: if r[P3]=null halt */
	17167	+#define OP_Halt 71
	17168	+#define OP_Integer 72 /* synopsis: r[P2]=P1 */
	17169	+#define OP_Int64 73 /* synopsis: r[P2]=P4 */
	17170	+#define OP_String 74 /* synopsis: r[P2]='P4' (len=P1) */
	17171	+#define OP_BeginSubrtn 75 /* synopsis: r[P2]=NULL */
	17172	+#define OP_Null 76 /* synopsis: r[P2..P3]=NULL */
	17173	+#define OP_SoftNull 77 /* synopsis: r[P1]=NULL */
	17174	+#define OP_Blob 78 /* synopsis: r[P2]=P4 (len=P1) */
	17175	+#define OP_Variable 79 /* synopsis: r[P2]=parameter(P1) */
	17176	+#define OP_Move 80 /* synopsis: r[P2@P3]=r[P1@P3] */
	17177	+#define OP_Copy 81 /* synopsis: r[P2@P3+1]=r[P1@P3+1] */
	17178	+#define OP_SCopy 82 /* synopsis: r[P2]=r[P1] */
	17179	+#define OP_IntCopy 83 /* synopsis: r[P2]=r[P1] */
	17180	+#define OP_FkCheck 84
	17181	+#define OP_ResultRow 85 /* synopsis: output=r[P1@P2] */
	17182	+#define OP_CollSeq 86
	17183	+#define OP_AddImm 87 /* synopsis: r[P1]=r[P1]+P2 */
	17184	+#define OP_RealAffinity 88
	17185	+#define OP_Cast 89 /* synopsis: affinity(r[P1]) */
	17186	+#define OP_Permutation 90
	17187	+#define OP_Compare 91 /* synopsis: r[P1@P3] <-> r[P2@P3] */
	17188	+#define OP_IsTrue 92 /* synopsis: r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4 */
	17189	+#define OP_ZeroOrNull 93 /* synopsis: r[P2] = 0 OR NULL */
	17190	+#define OP_Offset 94 /* synopsis: r[P3] = sqlite_offset(P1) */
	17191	+#define OP_Column 95 /* synopsis: r[P3]=PX cursor P1 column P2 */
	17192	+#define OP_TypeCheck 96 /* synopsis: typecheck(r[P1@P2]) */
	17193	+#define OP_Affinity 97 /* synopsis: affinity(r[P1@P2]) */
	17194	+#define OP_MakeRecord 98 /* synopsis: r[P3]=mkrec(r[P1@P2]) */
	17195	+#define OP_Count 99 /* synopsis: r[P2]=count() */
	17196	+#define OP_ReadCookie 100
	17197	+#define OP_SetCookie 101
	17198	+#define OP_ReopenIdx 102 /* synopsis: root=P2 iDb=P3 */
17149	17199	#define OP_BitAnd 103 /* same as TK_BITAND, synopsis: r[P3]=r[P1]&r[P2] */
17150	17200	#define OP_BitOr 104 /* same as TK_BITOR, synopsis: r[P3]=r[P1]\|r[P2] */
17151	17201	#define OP_ShiftLeft 105 /* same as TK_LSHIFT, synopsis: r[P3]=r[P2]<<r[P1] */
17152	17202	#define OP_ShiftRight 106 /* same as TK_RSHIFT, synopsis: r[P3]=r[P2]>>r[P1] */
17153	17203	#define OP_Add 107 /* same as TK_PLUS, synopsis: r[P3]=r[P1]+r[P2] */
		@@ -17154,87 +17204,88 @@
17154	17204	#define OP_Subtract 108 /* same as TK_MINUS, synopsis: r[P3]=r[P2]-r[P1] */
17155	17205	#define OP_Multiply 109 /* same as TK_STAR, synopsis: r[P3]=r[P1]r[P2] /
17156	17206	#define OP_Divide 110 /* same as TK_SLASH, synopsis: r[P3]=r[P2]/r[P1] */
17157	17207	#define OP_Remainder 111 /* same as TK_REM, synopsis: r[P3]=r[P2]%r[P1] */
17158	17208	#define OP_Concat 112 /* same as TK_CONCAT, synopsis: r[P3]=r[P2]+r[P1] */
17159		-#define OP_OpenWrite 113 /* synopsis: root=P2 iDb=P3 */
17160		-#define OP_OpenDup 114
	17209	+#define OP_OpenRead 113 /* synopsis: root=P2 iDb=P3 */
	17210	+#define OP_OpenWrite 114 /* synopsis: root=P2 iDb=P3 */
17161	17211	#define OP_BitNot 115 /* same as TK_BITNOT, synopsis: r[P2]= ~r[P1] */
17162		-#define OP_OpenAutoindex 116 /* synopsis: nColumn=P2 */
17163		-#define OP_OpenEphemeral 117 /* synopsis: nColumn=P2 */
	17212	+#define OP_OpenDup 116
	17213	+#define OP_OpenAutoindex 117 /* synopsis: nColumn=P2 */
17164	17214	#define OP_String8 118 /* same as TK_STRING, synopsis: r[P2]='P4' */
17165		-#define OP_SorterOpen 119
17166		-#define OP_SequenceTest 120 /* synopsis: if( cursor[P1].ctr++ ) pc = P2 */
17167		-#define OP_OpenPseudo 121 /* synopsis: P3 columns in r[P2] */
17168		-#define OP_Close 122
17169		-#define OP_ColumnsUsed 123
17170		-#define OP_SeekScan 124 /* synopsis: Scan-ahead up to P1 rows */
17171		-#define OP_SeekHit 125 /* synopsis: set P2<=seekHit<=P3 */
17172		-#define OP_Sequence 126 /* synopsis: r[P2]=cursor[P1].ctr++ */
17173		-#define OP_NewRowid 127 /* synopsis: r[P2]=rowid */
17174		-#define OP_Insert 128 /* synopsis: intkey=r[P3] data=r[P2] */
17175		-#define OP_RowCell 129
17176		-#define OP_Delete 130
17177		-#define OP_ResetCount 131
17178		-#define OP_SorterCompare 132 /* synopsis: if key(P1)!=trim(r[P3],P4) goto P2 */
17179		-#define OP_SorterData 133 /* synopsis: r[P2]=data */
17180		-#define OP_RowData 134 /* synopsis: r[P2]=data */
17181		-#define OP_Rowid 135 /* synopsis: r[P2]=PX rowid of P1 */
17182		-#define OP_NullRow 136
17183		-#define OP_SeekEnd 137
17184		-#define OP_IdxInsert 138 /* synopsis: key=r[P2] */
17185		-#define OP_SorterInsert 139 /* synopsis: key=r[P2] */
17186		-#define OP_IdxDelete 140 /* synopsis: key=r[P2@P3] */
17187		-#define OP_DeferredSeek 141 /* synopsis: Move P3 to P1.rowid if needed */
17188		-#define OP_IdxRowid 142 /* synopsis: r[P2]=rowid */
17189		-#define OP_FinishSeek 143
17190		-#define OP_Destroy 144
17191		-#define OP_Clear 145
17192		-#define OP_ResetSorter 146
17193		-#define OP_CreateBtree 147 /* synopsis: r[P2]=root iDb=P1 flags=P3 */
17194		-#define OP_SqlExec 148
17195		-#define OP_ParseSchema 149
17196		-#define OP_LoadAnalysis 150
17197		-#define OP_DropTable 151
17198		-#define OP_DropIndex 152
17199		-#define OP_DropTrigger 153
	17215	+#define OP_OpenEphemeral 119 /* synopsis: nColumn=P2 */
	17216	+#define OP_SorterOpen 120
	17217	+#define OP_SequenceTest 121 /* synopsis: if( cursor[P1].ctr++ ) pc = P2 */
	17218	+#define OP_OpenPseudo 122 /* synopsis: P3 columns in r[P2] */
	17219	+#define OP_Close 123
	17220	+#define OP_ColumnsUsed 124
	17221	+#define OP_SeekScan 125 /* synopsis: Scan-ahead up to P1 rows */
	17222	+#define OP_SeekHit 126 /* synopsis: set P2<=seekHit<=P3 */
	17223	+#define OP_Sequence 127 /* synopsis: r[P2]=cursor[P1].ctr++ */
	17224	+#define OP_NewRowid 128 /* synopsis: r[P2]=rowid */
	17225	+#define OP_Insert 129 /* synopsis: intkey=r[P3] data=r[P2] */
	17226	+#define OP_RowCell 130
	17227	+#define OP_Delete 131
	17228	+#define OP_ResetCount 132
	17229	+#define OP_SorterCompare 133 /* synopsis: if key(P1)!=trim(r[P3],P4) goto P2 */
	17230	+#define OP_SorterData 134 /* synopsis: r[P2]=data */
	17231	+#define OP_RowData 135 /* synopsis: r[P2]=data */
	17232	+#define OP_Rowid 136 /* synopsis: r[P2]=PX rowid of P1 */
	17233	+#define OP_NullRow 137
	17234	+#define OP_SeekEnd 138
	17235	+#define OP_IdxInsert 139 /* synopsis: key=r[P2] */
	17236	+#define OP_SorterInsert 140 /* synopsis: key=r[P2] */
	17237	+#define OP_IdxDelete 141 /* synopsis: key=r[P2@P3] */
	17238	+#define OP_DeferredSeek 142 /* synopsis: Move P3 to P1.rowid if needed */
	17239	+#define OP_IdxRowid 143 /* synopsis: r[P2]=rowid */
	17240	+#define OP_FinishSeek 144
	17241	+#define OP_Destroy 145
	17242	+#define OP_Clear 146
	17243	+#define OP_ResetSorter 147
	17244	+#define OP_CreateBtree 148 /* synopsis: r[P2]=root iDb=P1 flags=P3 */
	17245	+#define OP_SqlExec 149
	17246	+#define OP_ParseSchema 150
	17247	+#define OP_LoadAnalysis 151
	17248	+#define OP_DropTable 152
	17249	+#define OP_DropIndex 153
17200	17250	#define OP_Real 154 /* same as TK_FLOAT, synopsis: r[P2]=P4 */
17201		-#define OP_IntegrityCk 155
17202		-#define OP_RowSetAdd 156 /* synopsis: rowset(P1)=r[P2] */
17203		-#define OP_Param 157
17204		-#define OP_FkCounter 158 /* synopsis: fkctr[P1]+=P2 */
17205		-#define OP_MemMax 159 /* synopsis: r[P1]=max(r[P1],r[P2]) */
17206		-#define OP_OffsetLimit 160 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */
17207		-#define OP_AggInverse 161 /* synopsis: accum=r[P3] inverse(r[P2@P5]) */
17208		-#define OP_AggStep 162 /* synopsis: accum=r[P3] step(r[P2@P5]) */
17209		-#define OP_AggStep1 163 /* synopsis: accum=r[P3] step(r[P2@P5]) */
17210		-#define OP_AggValue 164 /* synopsis: r[P3]=value N=P2 */
17211		-#define OP_AggFinal 165 /* synopsis: accum=r[P1] N=P2 */
17212		-#define OP_Expire 166
17213		-#define OP_CursorLock 167
17214		-#define OP_CursorUnlock 168
17215		-#define OP_TableLock 169 /* synopsis: iDb=P1 root=P2 write=P3 */
17216		-#define OP_VBegin 170
17217		-#define OP_VCreate 171
17218		-#define OP_VDestroy 172
17219		-#define OP_VOpen 173
17220		-#define OP_VCheck 174
17221		-#define OP_VInitIn 175 /* synopsis: r[P2]=ValueList(P1,P3) */
17222		-#define OP_VColumn 176 /* synopsis: r[P3]=vcolumn(P2) */
17223		-#define OP_VRename 177
17224		-#define OP_Pagecount 178
17225		-#define OP_MaxPgcnt 179
17226		-#define OP_ClrSubtype 180 /* synopsis: r[P1].subtype = 0 */
17227		-#define OP_GetSubtype 181 /* synopsis: r[P2] = r[P1].subtype */
17228		-#define OP_SetSubtype 182 /* synopsis: r[P2].subtype = r[P1] */
17229		-#define OP_FilterAdd 183 /* synopsis: filter(P1) += key(P3@P4) */
17230		-#define OP_Trace 184
17231		-#define OP_CursorHint 185
17232		-#define OP_ReleaseReg 186 /* synopsis: release r[P1@P2] mask P3 */
17233		-#define OP_Noop 187
17234		-#define OP_Explain 188
17235		-#define OP_Abortable 189
	17251	+#define OP_DropTrigger 155
	17252	+#define OP_IntegrityCk 156
	17253	+#define OP_RowSetAdd 157 /* synopsis: rowset(P1)=r[P2] */
	17254	+#define OP_Param 158
	17255	+#define OP_FkCounter 159 /* synopsis: fkctr[P1]+=P2 */
	17256	+#define OP_MemMax 160 /* synopsis: r[P1]=max(r[P1],r[P2]) */
	17257	+#define OP_OffsetLimit 161 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */
	17258	+#define OP_AggInverse 162 /* synopsis: accum=r[P3] inverse(r[P2@P5]) */
	17259	+#define OP_AggStep 163 /* synopsis: accum=r[P3] step(r[P2@P5]) */
	17260	+#define OP_AggStep1 164 /* synopsis: accum=r[P3] step(r[P2@P5]) */
	17261	+#define OP_AggValue 165 /* synopsis: r[P3]=value N=P2 */
	17262	+#define OP_AggFinal 166 /* synopsis: accum=r[P1] N=P2 */
	17263	+#define OP_Expire 167
	17264	+#define OP_CursorLock 168
	17265	+#define OP_CursorUnlock 169
	17266	+#define OP_TableLock 170 /* synopsis: iDb=P1 root=P2 write=P3 */
	17267	+#define OP_VBegin 171
	17268	+#define OP_VCreate 172
	17269	+#define OP_VDestroy 173
	17270	+#define OP_VOpen 174
	17271	+#define OP_VCheck 175
	17272	+#define OP_VInitIn 176 /* synopsis: r[P2]=ValueList(P1,P3) */
	17273	+#define OP_VColumn 177 /* synopsis: r[P3]=vcolumn(P2) */
	17274	+#define OP_VRename 178
	17275	+#define OP_Pagecount 179
	17276	+#define OP_MaxPgcnt 180
	17277	+#define OP_ClrSubtype 181 /* synopsis: r[P1].subtype = 0 */
	17278	+#define OP_GetSubtype 182 /* synopsis: r[P2] = r[P1].subtype */
	17279	+#define OP_SetSubtype 183 /* synopsis: r[P2].subtype = r[P1] */
	17280	+#define OP_FilterAdd 184 /* synopsis: filter(P1) += key(P3@P4) */
	17281	+#define OP_Trace 185
	17282	+#define OP_CursorHint 186
	17283	+#define OP_ReleaseReg 187 /* synopsis: release r[P1@P2] mask P3 */
	17284	+#define OP_Noop 188
	17285	+#define OP_Explain 189
	17286	+#define OP_Abortable 190
17236	17287
17237	17288	/* Properties such as "out2" or "jump" that are specified in
17238	17289	** comments following the "case" for each opcode in the vdbe.c
17239	17290	** are encoded into bitvectors as follows:
17240	17291	*/
		@@ -17249,38 +17300,38 @@
17249	17300	#define OPFLG_INITIALIZER {\
17250	17301	/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x41, 0x00,\
17251	17302	/* 8 */ 0x81, 0x01, 0x01, 0x81, 0x83, 0x83, 0x01, 0x01,\
17252	17303	/* 16 */ 0x03, 0x03, 0x01, 0x12, 0x01, 0xc9, 0xc9, 0xc9,\
17253	17304	/* 24 */ 0xc9, 0x01, 0x49, 0x49, 0x49, 0x49, 0xc9, 0x49,\
17254		-/* 32 */ 0xc1, 0x01, 0x41, 0x41, 0xc1, 0x01, 0x41, 0x41,\
17255		-/* 40 */ 0x41, 0x41, 0x41, 0x26, 0x26, 0x41, 0x23, 0x0b,\
17256		-/* 48 */ 0x81, 0x01, 0x03, 0x03, 0x03, 0x0b, 0x0b, 0x0b,\
17257		-/* 56 */ 0x0b, 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x01, 0x41,\
17258		-/* 64 */ 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00, 0x10,\
17259		-/* 72 */ 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,\
17260		-/* 80 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02, 0x02,\
17261		-/* 88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x40, 0x00,\
17262		-/* 96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x40, 0x40, 0x26,\
	17305	+/* 32 */ 0xc1, 0x01, 0x41, 0x41, 0xc1, 0x01, 0x01, 0x41,\
	17306	+/* 40 */ 0x41, 0x41, 0x41, 0x26, 0x26, 0x41, 0x41, 0x23,\
	17307	+/* 48 */ 0x0b, 0x81, 0x01, 0x03, 0x03, 0x0b, 0x0b, 0x0b,\
	17308	+/* 56 */ 0x0b, 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x03, 0x01,\
	17309	+/* 64 */ 0x41, 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00,\
	17310	+/* 72 */ 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10,\
	17311	+/* 80 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02,\
	17312	+/* 88 */ 0x02, 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x40,\
	17313	+/* 96 */ 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x40, 0x26,\
17263	17314	/* 104 */ 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26,\
17264		-/* 112 */ 0x26, 0x00, 0x40, 0x12, 0x40, 0x40, 0x10, 0x00,\
17265		-/* 120 */ 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x10, 0x10,\
17266		-/* 128 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x50,\
17267		-/* 136 */ 0x00, 0x40, 0x04, 0x04, 0x00, 0x40, 0x50, 0x40,\
17268		-/* 144 */ 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,\
17269		-/* 152 */ 0x00, 0x00, 0x10, 0x00, 0x06, 0x10, 0x00, 0x04,\
17270		-/* 160 */ 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
17271		-/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x50,\
17272		-/* 176 */ 0x40, 0x00, 0x10, 0x10, 0x02, 0x12, 0x12, 0x00,\
17273		-/* 184 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,}
	17315	+/* 112 */ 0x26, 0x40, 0x00, 0x12, 0x40, 0x40, 0x10, 0x40,\
	17316	+/* 120 */ 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x10,\
	17317	+/* 128 */ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,\
	17318	+/* 136 */ 0x50, 0x00, 0x40, 0x04, 0x04, 0x00, 0x40, 0x50,\
	17319	+/* 144 */ 0x40, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,\
	17320	+/* 152 */ 0x00, 0x00, 0x10, 0x00, 0x00, 0x06, 0x10, 0x00,\
	17321	+/* 160 */ 0x04, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
	17322	+/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10,\
	17323	+/* 176 */ 0x50, 0x40, 0x00, 0x10, 0x10, 0x02, 0x12, 0x12,\
	17324	+/* 184 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,}
17274	17325
17275	17326	/* The resolve3P2Values() routine is able to run faster if it knows
17276	17327	** the value of the largest JUMP opcode. The smaller the maximum
17277	17328	** JUMP opcode the better, so the mkopcodeh.tcl script that
17278	17329	** generated this include file strives to group all JUMP opcodes
17279	17330	** together near the beginning of the list.
17280	17331	*/
17281		-#define SQLITE_MX_JUMP_OPCODE 64 /* Maximum JUMP opcode */
	17332	+#define SQLITE_MX_JUMP_OPCODE 65 /* Maximum JUMP opcode */
17282	17333
17283	17334	/************ End of opcodes.h *******************************************/
17284	17335	/************ Continuing where we left off in vdbe.h *********************/
17285	17336
17286	17337	/*
		@@ -17400,11 +17451,11 @@
17400	17451	SQLITE_PRIVATE char sqlite3VdbeExpandSql(Vdbe, const char*);
17401	17452	#endif
17402	17453	SQLITE_PRIVATE int sqlite3MemCompare(const Mem, const Mem, const CollSeq*);
17403	17454	SQLITE_PRIVATE int sqlite3BlobCompare(const Mem, const Mem);
17404	17455
17405		-SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(KeyInfo,int,const void,UnpackedRecord*);
	17456	+SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(int,const void,UnpackedRecord);
17406	17457	SQLITE_PRIVATE int sqlite3VdbeRecordCompare(int,const void,UnpackedRecord);
17407	17458	SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(int, const void , UnpackedRecord , int);
17408	17459	SQLITE_PRIVATE UnpackedRecord sqlite3VdbeAllocUnpackedRecord(KeyInfo);
17409	17460
17410	17461	typedef int (RecordCompare)(int,const void,UnpackedRecord*);
		@@ -17413,11 +17464,13 @@
17413	17464	SQLITE_PRIVATE void sqlite3VdbeLinkSubProgram(Vdbe , SubProgram );
17414	17465	SQLITE_PRIVATE int sqlite3VdbeHasSubProgram(Vdbe*);
17415	17466
17416	17467	SQLITE_PRIVATE void sqlite3MemSetArrayInt64(sqlite3_value *aMem, int iIdx, i64 val);
17417	17468
	17469	+#ifndef SQLITE_OMIT_DATETIME_FUNCS
17418	17470	SQLITE_PRIVATE int sqlite3NotPureFunc(sqlite3_context*);
	17471	+#endif
17419	17472	#ifdef SQLITE_ENABLE_BYTECODE_VTAB
17420	17473	SQLITE_PRIVATE int sqlite3VdbeBytecodeVtabInit(sqlite3*);
17421	17474	#endif
17422	17475
17423	17476	/* Use SQLITE_ENABLE_EXPLAIN_COMMENTS to enable generation of extra
		@@ -18295,10 +18348,11 @@
18295	18348	#define SQLITE_Coroutines 0x02000000 /* Co-routines for subqueries */
18296	18349	#define SQLITE_NullUnusedCols 0x04000000 /* NULL unused columns in subqueries */
18297	18350	#define SQLITE_OnePass 0x08000000 /* Single-pass DELETE and UPDATE */
18298	18351	#define SQLITE_OrderBySubq 0x10000000 /* ORDER BY in subquery helps outer */
18299	18352	#define SQLITE_StarQuery 0x20000000 /* Heurists for star queries */
	18353	+#define SQLITE_ExistsToJoin 0x40000000 /* The EXISTS-to-JOIN optimization */
18300	18354	#define SQLITE_AllOpts 0xffffffff /* All optimizations */
18301	18355
18302	18356	/*
18303	18357	** Macros for testing whether or not optimizations are enabled or disabled.
18304	18358	*/
		@@ -18533,11 +18587,11 @@
18533	18587	SQLITE_FUNC_CONSTANT\|SQLITE_UTF8\|(bNC*SQLITE_FUNC_NEEDCOLL)\|extraFlags,\
18534	18588	SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, 0, #zName, {0} }
18535	18589	#define STR_FUNCTION(zName, nArg, pArg, bNC, xFunc) \
18536	18590	{nArg, SQLITE_FUNC_BUILTIN\|\
18537	18591	SQLITE_FUNC_SLOCHNG\|SQLITE_UTF8\|(bNC*SQLITE_FUNC_NEEDCOLL), \
18538		- pArg, 0, xFunc, 0, 0, 0, #zName, }
	18592	+ pArg, 0, xFunc, 0, 0, 0, #zName, {0} }
18539	18593	#define LIKEFUNC(zName, nArg, arg, flags) \
18540	18594	{nArg, SQLITE_FUNC_BUILTIN\|SQLITE_FUNC_CONSTANT\|SQLITE_UTF8\|flags, \
18541	18595	(void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} }
18542	18596	#define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \
18543	18597	{nArg, SQLITE_FUNC_BUILTIN\|SQLITE_UTF8\|(nc*SQLITE_FUNC_NEEDCOLL)\|f, \
		@@ -18700,10 +18754,11 @@
18700	18754	#define SQLITE_AFF_TEXT 0x42 /* 'B' */
18701	18755	#define SQLITE_AFF_NUMERIC 0x43 /* 'C' */
18702	18756	#define SQLITE_AFF_INTEGER 0x44 /* 'D' */
18703	18757	#define SQLITE_AFF_REAL 0x45 /* 'E' */
18704	18758	#define SQLITE_AFF_FLEXNUM 0x46 /* 'F' */
	18759	+#define SQLITE_AFF_DEFER 0x58 /* 'X' - defer computation until later */
18705	18760
18706	18761	#define sqlite3IsNumericAffinity(X) ((X)>=SQLITE_AFF_NUMERIC)
18707	18762
18708	18763	/*
18709	18764	** The SQLITE_AFF_MASK values masks off the significant bits of an
		@@ -19015,13 +19070,19 @@
19015	19070	/*
19016	19071	** An instance of the following structure is passed as the first
19017	19072	** argument to sqlite3VdbeKeyCompare and is used to control the
19018	19073	** comparison of the two index keys.
19019	19074	**
19020		-** Note that aSortOrder[] and aColl[] have nField+1 slots. There
19021		-** are nField slots for the columns of an index then one extra slot
19022		-** for the rowid at the end.
	19075	+** The aSortOrder[] and aColl[] arrays have nAllField slots each. There
	19076	+** are nKeyField slots for the columns of an index then extra slots
	19077	+** for the rowid or key at the end. The aSortOrder array is located after
	19078	+** the aColl[] array.
	19079	+**
	19080	+** If SQLITE_ENABLE_PREUPDATE_HOOK is defined, then aSortFlags might be NULL
	19081	+** to indicate that this object is for use by a preupdate hook. When aSortFlags
	19082	+** is NULL, then nAllField is uninitialized and no space is allocated for
	19083	+** aColl[], so those fields may not be used.
19023	19084	*/
19024	19085	struct KeyInfo {
19025	19086	u32 nRef; /* Number of references to this KeyInfo object */
19026	19087	u8 enc; /* Text encoding - one of the SQLITE_UTF* values */
19027	19088	u16 nKeyField; /* Number of key columns in the index */
		@@ -19029,12 +19090,21 @@
19029	19090	sqlite3 db; / The database connection */
19030	19091	u8 aSortFlags; / Sort order for each column. */
19031	19092	CollSeq aColl[FLEXARRAY]; / Collating sequence for each term of the key */
19032	19093	};
19033	19094
19034		-/* The size (in bytes) of a KeyInfo object with up to N fields */
	19095	+/* The size (in bytes) of a KeyInfo object with up to N fields. This includes
	19096	+** the main body of the KeyInfo object and the aColl[] array of N elements,
	19097	+** but does not count the memory used to hold aSortFlags[]. */
19035	19098	#define SZ_KEYINFO(N) (offsetof(KeyInfo,aColl) + (N)sizeof(CollSeq))
	19099	+
	19100	+/* The size of a bare KeyInfo with no aColl[] entries */
	19101	+#if FLEXARRAY+1 > 1
	19102	+# define SZ_KEYINFO_0 offsetof(KeyInfo,aColl)
	19103	+#else
	19104	+# define SZ_KEYINFO_0 sizeof(KeyInfo)
	19105	+#endif
19036	19106
19037	19107	/*
19038	19108	** Allowed bit values for entries in the KeyInfo.aSortFlags[] array.
19039	19109	*/
19040	19110	#define KEYINFO_ORDER_DESC 0x01 /* DESC sort order */
		@@ -19050,23 +19120,22 @@
19050	19120	** the OP_MakeRecord opcode of the VDBE and is disassembled by the
19051	19121	** OP_Column opcode.
19052	19122	**
19053	19123	** An instance of this object serves as a "key" for doing a search on
19054	19124	** an index b+tree. The goal of the search is to find the entry that
19055		-** is closed to the key described by this object. This object might hold
19056		-** just a prefix of the key. The number of fields is given by
19057		-** pKeyInfo->nField.
	19125	+** is closest to the key described by this object. This object might hold
	19126	+** just a prefix of the key. The number of fields is given by nField.
19058	19127	**
19059	19128	** The r1 and r2 fields are the values to return if this key is less than
19060	19129	** or greater than a key in the btree, respectively. These are normally
19061	19130	** -1 and +1 respectively, but might be inverted to +1 and -1 if the b-tree
19062	19131	** is in DESC order.
19063	19132	**
19064	19133	** The key comparison functions actually return default_rc when they find
19065	19134	** an equals comparison. default_rc can be -1, 0, or +1. If there are
19066	19135	** multiple entries in the b-tree with the same key (when only looking
19067		-** at the first pKeyInfo->nFields,) then default_rc can be set to -1 to
	19136	+** at the first nField elements) then default_rc can be set to -1 to
19068	19137	** cause the search to find the last match, or +1 to cause the search to
19069	19138	** find the first match.
19070	19139	**
19071	19140	** The key comparison functions will set eqSeen to true if they ever
19072	19141	** get and equal results when comparing this structure to a b-tree record.
		@@ -19074,12 +19143,12 @@
19074	19143	** before the first match or immediately after the last match. The
19075	19144	** eqSeen field will indicate whether or not an exact match exists in the
19076	19145	** b-tree.
19077	19146	*/
19078	19147	struct UnpackedRecord {
19079		- KeyInfo pKeyInfo; / Collation and sort-order information */
19080		- Mem aMem; / Values */
	19148	+ KeyInfo pKeyInfo; / Comparison info for the index that is unpacked */
	19149	+ Mem aMem; / Values for columns of the index */
19081	19150	union {
19082	19151	char z; / Cache of aMem[0].z for vdbeRecordCompareString() */
19083	19152	i64 i; /* Cache of aMem[0].u.i for vdbeRecordCompareInt() */
19084	19153	} u;
19085	19154	int n; /* Cache of aMem[0].n used by vdbeRecordCompareString() */
		@@ -19160,14 +19229,12 @@
19160	19229	unsigned uniqNotNull:1; /* True if UNIQUE and NOT NULL for all columns */
19161	19230	unsigned isResized:1; /* True if resizeIndexObject() has been called */
19162	19231	unsigned isCovering:1; /* True if this is a covering index */
19163	19232	unsigned noSkipScan:1; /* Do not try to use skip-scan if true */
19164	19233	unsigned hasStat1:1; /* aiRowLogEst values come from sqlite_stat1 */
19165		- unsigned bLowQual:1; /* sqlite_stat1 says this is a low-quality index */
19166	19234	unsigned bNoQuery:1; /* Do not use this index to optimize queries */
19167	19235	unsigned bAscKeyBug:1; /* True if the bba7b69f9849b5bf bug applies */
19168		- unsigned bIdxRowid:1; /* One or more of the index keys is the ROWID */
19169	19236	unsigned bHasVCol:1; /* Index references one or more VIRTUAL columns */
19170	19237	unsigned bHasExpr:1; /* Index contains an expression, either a literal
19171	19238	** expression, or a reference to a VIRTUAL column */
19172	19239	#ifdef SQLITE_ENABLE_STAT4
19173	19240	int nSample; /* Number of elements in aSample[] */
		@@ -19251,21 +19318,21 @@
19251	19318	struct AggInfo {
19252	19319	u8 directMode; /* Direct rendering mode means take data directly
19253	19320	** from source tables rather than from accumulators */
19254	19321	u8 useSortingIdx; /* In direct mode, reference the sorting index rather
19255	19322	** than the source table */
19256		- u16 nSortingColumn; /* Number of columns in the sorting index */
	19323	+ u32 nSortingColumn; /* Number of columns in the sorting index */
19257	19324	int sortingIdx; /* Cursor number of the sorting index */
19258	19325	int sortingIdxPTab; /* Cursor number of pseudo-table */
19259	19326	int iFirstReg; /* First register in range for aCol[] and aFunc[] */
19260	19327	ExprList pGroupBy; / The group by clause */
19261	19328	struct AggInfo_col { /* For each column used in source tables */
19262	19329	Table pTab; / Source table */
19263	19330	Expr pCExpr; / The original expression */
19264	19331	int iTable; /* Cursor number of the source table */
19265		- i16 iColumn; /* Column number within the source table */
19266		- i16 iSorterColumn; /* Column number in the sorting index */
	19332	+ int iColumn; /* Column number within the source table */
	19333	+ int iSorterColumn; /* Column number in the sorting index */
19267	19334	} *aCol;
19268	19335	int nColumn; /* Number of used entries in aCol[] */
19269	19336	int nAccumulator; /* Number of columns that show through to the output.
19270	19337	** Additional columns are used only as parameters to
19271	19338	** aggregate functions */
		@@ -19725,10 +19792,11 @@
19725	19792	unsigned isSynthUsing :1; /* u3.pUsing is synthesized from NATURAL */
19726	19793	unsigned isNestedFrom :1; /* pSelect is a SF_NestedFrom subquery */
19727	19794	unsigned rowidUsed :1; /* The ROWID of this table is referenced */
19728	19795	unsigned fixedSchema :1; /* Uses u4.pSchema, not u4.zDatabase */
19729	19796	unsigned hadSchema :1; /* Had u4.zDatabase before u4.pSchema */
	19797	+ unsigned fromExists :1; /* Comes from WHERE EXISTS(...) */
19730	19798	} fg;
19731	19799	int iCursor; /* The VDBE cursor number used to access this table */
19732	19800	Bitmask colUsed; /* Bit N set if column N used. Details above for N>62 */
19733	19801	union {
19734	19802	char zIndexedBy; / Identifier from "INDEXED BY <zIndex>" clause */
		@@ -20255,10 +20323,11 @@
20255	20323	u8 mayAbort; /* True if statement may throw an ABORT exception */
20256	20324	u8 hasCompound; /* Need to invoke convertCompoundSelectToSubquery() */
20257	20325	u8 disableLookaside; /* Number of times lookaside has been disabled */
20258	20326	u8 prepFlags; /* SQLITE_PREPARE_* flags */
20259	20327	u8 withinRJSubrtn; /* Nesting level for RIGHT JOIN body subroutines */
	20328	+ u8 bHasExists; /* Has a correlated "EXISTS (SELECT ....)" expression */
20260	20329	u8 mSubrtnSig; /* mini Bloom filter on available SubrtnSig.selId */
20261	20330	u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */
20262	20331	u8 bReturning; /* Coding a RETURNING trigger */
20263	20332	u8 eOrconf; /* Default ON CONFLICT policy for trigger steps */
20264	20333	u8 disableTriggers; /* True to disable triggers */
		@@ -21251,10 +21320,11 @@
21251	21320	#endif
21252	21321	#ifndef SQLITE_OMIT_WINDOWFUNC
21253	21322	SQLITE_PRIVATE void sqlite3ShowWindow(const Window*);
21254	21323	SQLITE_PRIVATE void sqlite3ShowWinFunc(const Window*);
21255	21324	#endif
	21325	+SQLITE_PRIVATE void sqlite3ShowBitvec(Bitvec*);
21256	21326	#endif
21257	21327
21258	21328	SQLITE_PRIVATE void sqlite3SetString(char *, sqlite3, const char*);
21259	21329	SQLITE_PRIVATE void sqlite3ProgressCheck(Parse*);
21260	21330	SQLITE_PRIVATE void sqlite3ErrorMsg(Parse, const char, ...);
		@@ -22424,10 +22494,13 @@
22424	22494	#ifdef SQLITE_BITMASK_TYPE
22425	22495	"BITMASK_TYPE=" CTIMEOPT_VAL(SQLITE_BITMASK_TYPE),
22426	22496	#endif
22427	22497	#ifdef SQLITE_BUG_COMPATIBLE_20160819
22428	22498	"BUG_COMPATIBLE_20160819",
	22499	+#endif
	22500	+#ifdef SQLITE_BUG_COMPATIBLE_20250510
	22501	+ "BUG_COMPATIBLE_20250510",
22429	22502	#endif
22430	22503	#ifdef SQLITE_CASE_SENSITIVE_LIKE
22431	22504	"CASE_SENSITIVE_LIKE",
22432	22505	#endif
22433	22506	#ifdef SQLITE_CHECK_PAGES
		@@ -23860,11 +23933,11 @@
23860	23933	** * MEM_Blob A blob, stored in Mem.z length Mem.n.
23861	23934	** Incompatible with MEM_Str, MEM_Null,
23862	23935	** MEM_Int, MEM_Real, and MEM_IntReal.
23863	23936	**
23864	23937	** * MEM_Blob\|MEM_Zero A blob in Mem.z of length Mem.n plus
23865		-** MEM.u.i extra 0x00 bytes at the end.
	23938	+** Mem.u.nZero extra 0x00 bytes at the end.
23866	23939	**
23867	23940	** * MEM_Int Integer stored in Mem.u.i.
23868	23941	**
23869	23942	** * MEM_Real Real stored in Mem.u.r.
23870	23943	**
		@@ -24129,11 +24202,11 @@
24129	24202	Mem oldipk; /* Memory cell holding "old" IPK value */
24130	24203	Mem aNew; / Array of new.* values */
24131	24204	Table pTab; / Schema object being updated */
24132	24205	Index pPk; / PK index if pTab is WITHOUT ROWID */
24133	24206	sqlite3_value *apDflt; / Array of default values, if required */
24134		- u8 keyinfoSpace[SZ_KEYINFO(0)]; /* Space to hold pKeyinfo[0] content */
	24207	+ u8 keyinfoSpace[SZ_KEYINFO_0]; /* Space to hold pKeyinfo[0] content */
24135	24208	};
24136	24209
24137	24210	/*
24138	24211	** An instance of this object is used to pass an vector of values into
24139	24212	** OP_VFilter, the xFilter method of a virtual table. The vector is the
		@@ -32059,10 +32132,18 @@
32059	32132	}else{
32060	32133	longvalue = va_arg(ap,unsigned int);
32061	32134	}
32062	32135	prefix = 0;
32063	32136	}
	32137	+
	32138	+#if WHERETRACE_ENABLED
	32139	+ if( xtype==etPOINTER && sqlite3WhereTrace & 0x100000 ) longvalue = 0;
	32140	+#endif
	32141	+#if TREETRACE_ENABLED
	32142	+ if( xtype==etPOINTER && sqlite3TreeTrace & 0x100000 ) longvalue = 0;
	32143	+#endif
	32144	+
32064	32145	if( longvalue==0 ) flag_alternateform = 0;
32065	32146	if( flag_zeropad && precision<width-(prefix!=0) ){
32066	32147	precision = width-(prefix!=0);
32067	32148	}
32068	32149	if( precision<etBUFSIZE-10-etBUFSIZE/3 ){
		@@ -32987,10 +33068,19 @@
32987	33068	va_end(ap);
32988	33069	zBuf[acc.nChar] = 0;
32989	33070	return zBuf;
32990	33071	}
32991	33072
	33073	+/* Maximum size of an sqlite3_log() message. */
	33074	+#if defined(SQLITE_MAX_LOG_MESSAGE)
	33075	+ /* Leave the definition as supplied */
	33076	+#elif SQLITE_PRINT_BUF_SIZE*10>10000
	33077	+# define SQLITE_MAX_LOG_MESSAGE 10000
	33078	+#else
	33079	+# define SQLITE_MAX_LOG_MESSAGE (SQLITE_PRINT_BUF_SIZE*10)
	33080	+#endif
	33081	+
32992	33082	/*
32993	33083	** This is the routine that actually formats the sqlite3_log() message.
32994	33084	** We house it in a separate routine from sqlite3_log() to avoid using
32995	33085	** stack space on small-stack systems when logging is disabled.
32996	33086	**
		@@ -33003,11 +33093,11 @@
33003	33093	** Care must be taken that any sqlite3_log() calls that occur while the
33004	33094	** memory mutex is held do not use these mechanisms.
33005	33095	*/
33006	33096	static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){
33007	33097	StrAccum acc; /* String accumulator */
33008		- char zMsg[SQLITE_PRINT_BUF_SIZE3]; / Complete log message */
	33098	+ char zMsg[SQLITE_MAX_LOG_MESSAGE]; /* Complete log message */
33009	33099
33010	33100	sqlite3StrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0);
33011	33101	sqlite3_str_vappendf(&acc, zFormat, ap);
33012	33102	sqlite3GlobalConfig.xLog(sqlite3GlobalConfig.pLogArg, iErrCode,
33013	33103	sqlite3StrAccumFinish(&acc));
		@@ -35001,11 +35091,11 @@
35001	35091	}
35002	35092
35003	35093	/*
35004	35094	** Write a single UTF8 character whose value is v into the
35005	35095	** buffer starting at zOut. zOut must be sized to hold at
35006		-** least for bytes. Return the number of bytes needed
	35096	+** least four bytes. Return the number of bytes needed
35007	35097	** to encode the new character.
35008	35098	*/
35009	35099	SQLITE_PRIVATE int sqlite3AppendOneUtf8Character(char *zOut, u32 v){
35010	35100	if( v<0x00080 ){
35011	35101	zOut[0] = (u8)(v & 0xff);
		@@ -37681,76 +37771,76 @@
37681	37771	/* 32 */ "Last" OpHelp(""),
37682	37772	/* 33 */ "IfSizeBetween" OpHelp(""),
37683	37773	/* 34 */ "SorterSort" OpHelp(""),
37684	37774	/* 35 */ "Sort" OpHelp(""),
37685	37775	/* 36 */ "Rewind" OpHelp(""),
37686		- /* 37 */ "SorterNext" OpHelp(""),
37687		- /* 38 */ "Prev" OpHelp(""),
37688		- /* 39 */ "Next" OpHelp(""),
37689		- /* 40 */ "IdxLE" OpHelp("key=r[P3@P4]"),
37690		- /* 41 */ "IdxGT" OpHelp("key=r[P3@P4]"),
37691		- /* 42 */ "IdxLT" OpHelp("key=r[P3@P4]"),
	37776	+ /* 37 */ "IfEmpty" OpHelp("if( empty(P1) ) goto P2"),
	37777	+ /* 38 */ "SorterNext" OpHelp(""),
	37778	+ /* 39 */ "Prev" OpHelp(""),
	37779	+ /* 40 */ "Next" OpHelp(""),
	37780	+ /* 41 */ "IdxLE" OpHelp("key=r[P3@P4]"),
	37781	+ /* 42 */ "IdxGT" OpHelp("key=r[P3@P4]"),
37692	37782	/* 43 */ "Or" OpHelp("r[P3]=(r[P1] \|\| r[P2])"),
37693	37783	/* 44 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"),
37694		- /* 45 */ "IdxGE" OpHelp("key=r[P3@P4]"),
37695		- /* 46 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
37696		- /* 47 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
37697		- /* 48 */ "Program" OpHelp(""),
37698		- /* 49 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
37699		- /* 50 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
	37784	+ /* 45 */ "IdxLT" OpHelp("key=r[P3@P4]"),
	37785	+ /* 46 */ "IdxGE" OpHelp("key=r[P3@P4]"),
	37786	+ /* 47 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
	37787	+ /* 48 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
	37788	+ /* 49 */ "Program" OpHelp(""),
	37789	+ /* 50 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
37700	37790	/* 51 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"),
37701	37791	/* 52 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"),
37702	37792	/* 53 */ "Ne" OpHelp("IF r[P3]!=r[P1]"),
37703	37793	/* 54 */ "Eq" OpHelp("IF r[P3]==r[P1]"),
37704	37794	/* 55 */ "Gt" OpHelp("IF r[P3]>r[P1]"),
37705	37795	/* 56 */ "Le" OpHelp("IF r[P3]<=r[P1]"),
37706	37796	/* 57 */ "Lt" OpHelp("IF r[P3]<r[P1]"),
37707	37797	/* 58 */ "Ge" OpHelp("IF r[P3]>=r[P1]"),
37708	37798	/* 59 */ "ElseEq" OpHelp(""),
37709		- /* 60 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
37710		- /* 61 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
37711		- /* 62 */ "IncrVacuum" OpHelp(""),
37712		- /* 63 */ "VNext" OpHelp(""),
37713		- /* 64 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
37714		- /* 65 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
37715		- /* 66 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
37716		- /* 67 */ "Return" OpHelp(""),
37717		- /* 68 */ "EndCoroutine" OpHelp(""),
37718		- /* 69 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
37719		- /* 70 */ "Halt" OpHelp(""),
37720		- /* 71 */ "Integer" OpHelp("r[P2]=P1"),
37721		- /* 72 */ "Int64" OpHelp("r[P2]=P4"),
37722		- /* 73 */ "String" OpHelp("r[P2]='P4' (len=P1)"),
37723		- /* 74 */ "BeginSubrtn" OpHelp("r[P2]=NULL"),
37724		- /* 75 */ "Null" OpHelp("r[P2..P3]=NULL"),
37725		- /* 76 */ "SoftNull" OpHelp("r[P1]=NULL"),
37726		- /* 77 */ "Blob" OpHelp("r[P2]=P4 (len=P1)"),
37727		- /* 78 */ "Variable" OpHelp("r[P2]=parameter(P1)"),
37728		- /* 79 */ "Move" OpHelp("r[P2@P3]=r[P1@P3]"),
37729		- /* 80 */ "Copy" OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
37730		- /* 81 */ "SCopy" OpHelp("r[P2]=r[P1]"),
37731		- /* 82 */ "IntCopy" OpHelp("r[P2]=r[P1]"),
37732		- /* 83 */ "FkCheck" OpHelp(""),
37733		- /* 84 */ "ResultRow" OpHelp("output=r[P1@P2]"),
37734		- /* 85 */ "CollSeq" OpHelp(""),
37735		- /* 86 */ "AddImm" OpHelp("r[P1]=r[P1]+P2"),
37736		- /* 87 */ "RealAffinity" OpHelp(""),
37737		- /* 88 */ "Cast" OpHelp("affinity(r[P1])"),
37738		- /* 89 */ "Permutation" OpHelp(""),
37739		- /* 90 */ "Compare" OpHelp("r[P1@P3] <-> r[P2@P3]"),
37740		- /* 91 */ "IsTrue" OpHelp("r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4"),
37741		- /* 92 */ "ZeroOrNull" OpHelp("r[P2] = 0 OR NULL"),
37742		- /* 93 */ "Offset" OpHelp("r[P3] = sqlite_offset(P1)"),
37743		- /* 94 */ "Column" OpHelp("r[P3]=PX cursor P1 column P2"),
37744		- /* 95 */ "TypeCheck" OpHelp("typecheck(r[P1@P2])"),
37745		- /* 96 */ "Affinity" OpHelp("affinity(r[P1@P2])"),
37746		- /* 97 */ "MakeRecord" OpHelp("r[P3]=mkrec(r[P1@P2])"),
37747		- /* 98 */ "Count" OpHelp("r[P2]=count()"),
37748		- /* 99 */ "ReadCookie" OpHelp(""),
37749		- /* 100 */ "SetCookie" OpHelp(""),
37750		- /* 101 */ "ReopenIdx" OpHelp("root=P2 iDb=P3"),
37751		- /* 102 */ "OpenRead" OpHelp("root=P2 iDb=P3"),
	37799	+ /* 60 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
	37800	+ /* 61 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
	37801	+ /* 62 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
	37802	+ /* 63 */ "IncrVacuum" OpHelp(""),
	37803	+ /* 64 */ "VNext" OpHelp(""),
	37804	+ /* 65 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
	37805	+ /* 66 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
	37806	+ /* 67 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
	37807	+ /* 68 */ "Return" OpHelp(""),
	37808	+ /* 69 */ "EndCoroutine" OpHelp(""),
	37809	+ /* 70 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
	37810	+ /* 71 */ "Halt" OpHelp(""),
	37811	+ /* 72 */ "Integer" OpHelp("r[P2]=P1"),
	37812	+ /* 73 */ "Int64" OpHelp("r[P2]=P4"),
	37813	+ /* 74 */ "String" OpHelp("r[P2]='P4' (len=P1)"),
	37814	+ /* 75 */ "BeginSubrtn" OpHelp("r[P2]=NULL"),
	37815	+ /* 76 */ "Null" OpHelp("r[P2..P3]=NULL"),
	37816	+ /* 77 */ "SoftNull" OpHelp("r[P1]=NULL"),
	37817	+ /* 78 */ "Blob" OpHelp("r[P2]=P4 (len=P1)"),
	37818	+ /* 79 */ "Variable" OpHelp("r[P2]=parameter(P1)"),
	37819	+ /* 80 */ "Move" OpHelp("r[P2@P3]=r[P1@P3]"),
	37820	+ /* 81 */ "Copy" OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
	37821	+ /* 82 */ "SCopy" OpHelp("r[P2]=r[P1]"),
	37822	+ /* 83 */ "IntCopy" OpHelp("r[P2]=r[P1]"),
	37823	+ /* 84 */ "FkCheck" OpHelp(""),
	37824	+ /* 85 */ "ResultRow" OpHelp("output=r[P1@P2]"),
	37825	+ /* 86 */ "CollSeq" OpHelp(""),
	37826	+ /* 87 */ "AddImm" OpHelp("r[P1]=r[P1]+P2"),
	37827	+ /* 88 */ "RealAffinity" OpHelp(""),
	37828	+ /* 89 */ "Cast" OpHelp("affinity(r[P1])"),
	37829	+ /* 90 */ "Permutation" OpHelp(""),
	37830	+ /* 91 */ "Compare" OpHelp("r[P1@P3] <-> r[P2@P3]"),
	37831	+ /* 92 */ "IsTrue" OpHelp("r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4"),
	37832	+ /* 93 */ "ZeroOrNull" OpHelp("r[P2] = 0 OR NULL"),
	37833	+ /* 94 */ "Offset" OpHelp("r[P3] = sqlite_offset(P1)"),
	37834	+ /* 95 */ "Column" OpHelp("r[P3]=PX cursor P1 column P2"),
	37835	+ /* 96 */ "TypeCheck" OpHelp("typecheck(r[P1@P2])"),
	37836	+ /* 97 */ "Affinity" OpHelp("affinity(r[P1@P2])"),
	37837	+ /* 98 */ "MakeRecord" OpHelp("r[P3]=mkrec(r[P1@P2])"),
	37838	+ /* 99 */ "Count" OpHelp("r[P2]=count()"),
	37839	+ /* 100 */ "ReadCookie" OpHelp(""),
	37840	+ /* 101 */ "SetCookie" OpHelp(""),
	37841	+ /* 102 */ "ReopenIdx" OpHelp("root=P2 iDb=P3"),
37752	37842	/* 103 */ "BitAnd" OpHelp("r[P3]=r[P1]&r[P2]"),
37753	37843	/* 104 */ "BitOr" OpHelp("r[P3]=r[P1]\|r[P2]"),
37754	37844	/* 105 */ "ShiftLeft" OpHelp("r[P3]=r[P2]<<r[P1]"),
37755	37845	/* 106 */ "ShiftRight" OpHelp("r[P3]=r[P2]>>r[P1]"),
37756	37846	/* 107 */ "Add" OpHelp("r[P3]=r[P1]+r[P2]"),
		@@ -37757,87 +37847,88 @@
37757	37847	/* 108 */ "Subtract" OpHelp("r[P3]=r[P2]-r[P1]"),
37758	37848	/* 109 / "Multiply" OpHelp("r[P3]=r[P1]r[P2]"),
37759	37849	/* 110 */ "Divide" OpHelp("r[P3]=r[P2]/r[P1]"),
37760	37850	/* 111 */ "Remainder" OpHelp("r[P3]=r[P2]%r[P1]"),
37761	37851	/* 112 */ "Concat" OpHelp("r[P3]=r[P2]+r[P1]"),
37762		- /* 113 */ "OpenWrite" OpHelp("root=P2 iDb=P3"),
37763		- /* 114 */ "OpenDup" OpHelp(""),
	37852	+ /* 113 */ "OpenRead" OpHelp("root=P2 iDb=P3"),
	37853	+ /* 114 */ "OpenWrite" OpHelp("root=P2 iDb=P3"),
37764	37854	/* 115 */ "BitNot" OpHelp("r[P2]= ~r[P1]"),
37765		- /* 116 */ "OpenAutoindex" OpHelp("nColumn=P2"),
37766		- /* 117 */ "OpenEphemeral" OpHelp("nColumn=P2"),
	37855	+ /* 116 */ "OpenDup" OpHelp(""),
	37856	+ /* 117 */ "OpenAutoindex" OpHelp("nColumn=P2"),
37767	37857	/* 118 */ "String8" OpHelp("r[P2]='P4'"),
37768		- /* 119 */ "SorterOpen" OpHelp(""),
37769		- /* 120 */ "SequenceTest" OpHelp("if( cursor[P1].ctr++ ) pc = P2"),
37770		- /* 121 */ "OpenPseudo" OpHelp("P3 columns in r[P2]"),
37771		- /* 122 */ "Close" OpHelp(""),
37772		- /* 123 */ "ColumnsUsed" OpHelp(""),
37773		- /* 124 */ "SeekScan" OpHelp("Scan-ahead up to P1 rows"),
37774		- /* 125 */ "SeekHit" OpHelp("set P2<=seekHit<=P3"),
37775		- /* 126 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"),
37776		- /* 127 */ "NewRowid" OpHelp("r[P2]=rowid"),
37777		- /* 128 */ "Insert" OpHelp("intkey=r[P3] data=r[P2]"),
37778		- /* 129 */ "RowCell" OpHelp(""),
37779		- /* 130 */ "Delete" OpHelp(""),
37780		- /* 131 */ "ResetCount" OpHelp(""),
37781		- /* 132 */ "SorterCompare" OpHelp("if key(P1)!=trim(r[P3],P4) goto P2"),
37782		- /* 133 */ "SorterData" OpHelp("r[P2]=data"),
37783		- /* 134 */ "RowData" OpHelp("r[P2]=data"),
37784		- /* 135 */ "Rowid" OpHelp("r[P2]=PX rowid of P1"),
37785		- /* 136 */ "NullRow" OpHelp(""),
37786		- /* 137 */ "SeekEnd" OpHelp(""),
37787		- /* 138 */ "IdxInsert" OpHelp("key=r[P2]"),
37788		- /* 139 */ "SorterInsert" OpHelp("key=r[P2]"),
37789		- /* 140 */ "IdxDelete" OpHelp("key=r[P2@P3]"),
37790		- /* 141 */ "DeferredSeek" OpHelp("Move P3 to P1.rowid if needed"),
37791		- /* 142 */ "IdxRowid" OpHelp("r[P2]=rowid"),
37792		- /* 143 */ "FinishSeek" OpHelp(""),
37793		- /* 144 */ "Destroy" OpHelp(""),
37794		- /* 145 */ "Clear" OpHelp(""),
37795		- /* 146 */ "ResetSorter" OpHelp(""),
37796		- /* 147 */ "CreateBtree" OpHelp("r[P2]=root iDb=P1 flags=P3"),
37797		- /* 148 */ "SqlExec" OpHelp(""),
37798		- /* 149 */ "ParseSchema" OpHelp(""),
37799		- /* 150 */ "LoadAnalysis" OpHelp(""),
37800		- /* 151 */ "DropTable" OpHelp(""),
37801		- /* 152 */ "DropIndex" OpHelp(""),
37802		- /* 153 */ "DropTrigger" OpHelp(""),
	37858	+ /* 119 */ "OpenEphemeral" OpHelp("nColumn=P2"),
	37859	+ /* 120 */ "SorterOpen" OpHelp(""),
	37860	+ /* 121 */ "SequenceTest" OpHelp("if( cursor[P1].ctr++ ) pc = P2"),
	37861	+ /* 122 */ "OpenPseudo" OpHelp("P3 columns in r[P2]"),
	37862	+ /* 123 */ "Close" OpHelp(""),
	37863	+ /* 124 */ "ColumnsUsed" OpHelp(""),
	37864	+ /* 125 */ "SeekScan" OpHelp("Scan-ahead up to P1 rows"),
	37865	+ /* 126 */ "SeekHit" OpHelp("set P2<=seekHit<=P3"),
	37866	+ /* 127 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"),
	37867	+ /* 128 */ "NewRowid" OpHelp("r[P2]=rowid"),
	37868	+ /* 129 */ "Insert" OpHelp("intkey=r[P3] data=r[P2]"),
	37869	+ /* 130 */ "RowCell" OpHelp(""),
	37870	+ /* 131 */ "Delete" OpHelp(""),
	37871	+ /* 132 */ "ResetCount" OpHelp(""),
	37872	+ /* 133 */ "SorterCompare" OpHelp("if key(P1)!=trim(r[P3],P4) goto P2"),
	37873	+ /* 134 */ "SorterData" OpHelp("r[P2]=data"),
	37874	+ /* 135 */ "RowData" OpHelp("r[P2]=data"),
	37875	+ /* 136 */ "Rowid" OpHelp("r[P2]=PX rowid of P1"),
	37876	+ /* 137 */ "NullRow" OpHelp(""),
	37877	+ /* 138 */ "SeekEnd" OpHelp(""),
	37878	+ /* 139 */ "IdxInsert" OpHelp("key=r[P2]"),
	37879	+ /* 140 */ "SorterInsert" OpHelp("key=r[P2]"),
	37880	+ /* 141 */ "IdxDelete" OpHelp("key=r[P2@P3]"),
	37881	+ /* 142 */ "DeferredSeek" OpHelp("Move P3 to P1.rowid if needed"),
	37882	+ /* 143 */ "IdxRowid" OpHelp("r[P2]=rowid"),
	37883	+ /* 144 */ "FinishSeek" OpHelp(""),
	37884	+ /* 145 */ "Destroy" OpHelp(""),
	37885	+ /* 146 */ "Clear" OpHelp(""),
	37886	+ /* 147 */ "ResetSorter" OpHelp(""),
	37887	+ /* 148 */ "CreateBtree" OpHelp("r[P2]=root iDb=P1 flags=P3"),
	37888	+ /* 149 */ "SqlExec" OpHelp(""),
	37889	+ /* 150 */ "ParseSchema" OpHelp(""),
	37890	+ /* 151 */ "LoadAnalysis" OpHelp(""),
	37891	+ /* 152 */ "DropTable" OpHelp(""),
	37892	+ /* 153 */ "DropIndex" OpHelp(""),
37803	37893	/* 154 */ "Real" OpHelp("r[P2]=P4"),
37804		- /* 155 */ "IntegrityCk" OpHelp(""),
37805		- /* 156 */ "RowSetAdd" OpHelp("rowset(P1)=r[P2]"),
37806		- /* 157 */ "Param" OpHelp(""),
37807		- /* 158 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
37808		- /* 159 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
37809		- /* 160 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"),
37810		- /* 161 */ "AggInverse" OpHelp("accum=r[P3] inverse(r[P2@P5])"),
37811		- /* 162 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"),
37812		- /* 163 */ "AggStep1" OpHelp("accum=r[P3] step(r[P2@P5])"),
37813		- /* 164 */ "AggValue" OpHelp("r[P3]=value N=P2"),
37814		- /* 165 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
37815		- /* 166 */ "Expire" OpHelp(""),
37816		- /* 167 */ "CursorLock" OpHelp(""),
37817		- /* 168 */ "CursorUnlock" OpHelp(""),
37818		- /* 169 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
37819		- /* 170 */ "VBegin" OpHelp(""),
37820		- /* 171 */ "VCreate" OpHelp(""),
37821		- /* 172 */ "VDestroy" OpHelp(""),
37822		- /* 173 */ "VOpen" OpHelp(""),
37823		- /* 174 */ "VCheck" OpHelp(""),
37824		- /* 175 */ "VInitIn" OpHelp("r[P2]=ValueList(P1,P3)"),
37825		- /* 176 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
37826		- /* 177 */ "VRename" OpHelp(""),
37827		- /* 178 */ "Pagecount" OpHelp(""),
37828		- /* 179 */ "MaxPgcnt" OpHelp(""),
37829		- /* 180 */ "ClrSubtype" OpHelp("r[P1].subtype = 0"),
37830		- /* 181 */ "GetSubtype" OpHelp("r[P2] = r[P1].subtype"),
37831		- /* 182 */ "SetSubtype" OpHelp("r[P2].subtype = r[P1]"),
37832		- /* 183 */ "FilterAdd" OpHelp("filter(P1) += key(P3@P4)"),
37833		- /* 184 */ "Trace" OpHelp(""),
37834		- /* 185 */ "CursorHint" OpHelp(""),
37835		- /* 186 */ "ReleaseReg" OpHelp("release r[P1@P2] mask P3"),
37836		- /* 187 */ "Noop" OpHelp(""),
37837		- /* 188 */ "Explain" OpHelp(""),
37838		- /* 189 */ "Abortable" OpHelp(""),
	37894	+ /* 155 */ "DropTrigger" OpHelp(""),
	37895	+ /* 156 */ "IntegrityCk" OpHelp(""),
	37896	+ /* 157 */ "RowSetAdd" OpHelp("rowset(P1)=r[P2]"),
	37897	+ /* 158 */ "Param" OpHelp(""),
	37898	+ /* 159 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
	37899	+ /* 160 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
	37900	+ /* 161 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"),
	37901	+ /* 162 */ "AggInverse" OpHelp("accum=r[P3] inverse(r[P2@P5])"),
	37902	+ /* 163 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"),
	37903	+ /* 164 */ "AggStep1" OpHelp("accum=r[P3] step(r[P2@P5])"),
	37904	+ /* 165 */ "AggValue" OpHelp("r[P3]=value N=P2"),
	37905	+ /* 166 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
	37906	+ /* 167 */ "Expire" OpHelp(""),
	37907	+ /* 168 */ "CursorLock" OpHelp(""),
	37908	+ /* 169 */ "CursorUnlock" OpHelp(""),
	37909	+ /* 170 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
	37910	+ /* 171 */ "VBegin" OpHelp(""),
	37911	+ /* 172 */ "VCreate" OpHelp(""),
	37912	+ /* 173 */ "VDestroy" OpHelp(""),
	37913	+ /* 174 */ "VOpen" OpHelp(""),
	37914	+ /* 175 */ "VCheck" OpHelp(""),
	37915	+ /* 176 */ "VInitIn" OpHelp("r[P2]=ValueList(P1,P3)"),
	37916	+ /* 177 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
	37917	+ /* 178 */ "VRename" OpHelp(""),
	37918	+ /* 179 */ "Pagecount" OpHelp(""),
	37919	+ /* 180 */ "MaxPgcnt" OpHelp(""),
	37920	+ /* 181 */ "ClrSubtype" OpHelp("r[P1].subtype = 0"),
	37921	+ /* 182 */ "GetSubtype" OpHelp("r[P2] = r[P1].subtype"),
	37922	+ /* 183 */ "SetSubtype" OpHelp("r[P2].subtype = r[P1]"),
	37923	+ /* 184 */ "FilterAdd" OpHelp("filter(P1) += key(P3@P4)"),
	37924	+ /* 185 */ "Trace" OpHelp(""),
	37925	+ /* 186 */ "CursorHint" OpHelp(""),
	37926	+ /* 187 */ "ReleaseReg" OpHelp("release r[P1@P2] mask P3"),
	37927	+ /* 188 */ "Noop" OpHelp(""),
	37928	+ /* 189 */ "Explain" OpHelp(""),
	37929	+ /* 190 */ "Abortable" OpHelp(""),
37839	37930	};
37840	37931	return azName[i];
37841	37932	}
37842	37933	#endif
37843	37934
		@@ -43860,25 +43951,24 @@
43860	43951	assert( pShmNode->hShm<0 \|\| pDbFd->pInode->bProcessLock==0 );
43861	43952
43862	43953	/* Check that, if this to be a blocking lock, no locks that occur later
43863	43954	** in the following list than the lock being obtained are already held:
43864	43955	**
43865		- ** 1. Checkpointer lock (ofst==1).
43866		- ** 2. Write lock (ofst==0).
43867		- ** 3. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).
	43956	+ ** 1. Recovery lock (ofst==2).
	43957	+ ** 2. Checkpointer lock (ofst==1).
	43958	+ ** 3. Write lock (ofst==0).
	43959	+ ** 4. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).
43868	43960	**
43869	43961	** In other words, if this is a blocking lock, none of the locks that
43870	43962	** occur later in the above list than the lock being obtained may be
43871	43963	** held.
43872		- **
43873		- ** It is not permitted to block on the RECOVER lock.
43874	43964	*/
43875	43965	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
43876	43966	{
43877	43967	u16 lockMask = (p->exclMask\|p->sharedMask);
43878	43968	assert( (flags & SQLITE_SHM_UNLOCK) \|\| pDbFd->iBusyTimeout==0 \|\| (
43879		- (ofst!=2) /* not RECOVER */
	43969	+ (ofst!=2 \|\| lockMask==0)
43880	43970	&& (ofst!=1 \|\| lockMask==0 \|\| lockMask==2)
43881	43971	&& (ofst!=0 \|\| lockMask<3)
43882	43972	&& (ofst<3 \|\| lockMask<(1<<ofst))
43883	43973	));
43884	43974	}
		@@ -49835,11 +49925,15 @@
49835	49925	DWORD nDelay = (nMs==0 ? INFINITE : nMs);
49836	49926	DWORD res = osWaitForSingleObject(ovlp.hEvent, nDelay);
49837	49927	if( res==WAIT_OBJECT_0 ){
49838	49928	ret = TRUE;
49839	49929	}else if( res==WAIT_TIMEOUT ){
	49930	+#if SQLITE_ENABLE_SETLK_TIMEOUT==1
49840	49931	rc = SQLITE_BUSY_TIMEOUT;
	49932	+#else
	49933	+ rc = SQLITE_BUSY;
	49934	+#endif
49841	49935	}else{
49842	49936	/* Some other error has occurred */
49843	49937	rc = SQLITE_IOERR_LOCK;
49844	49938	}
49845	49939
		@@ -51321,17 +51415,17 @@
51321	51415	int nChar;
51322	51416	LPWSTR zWideFilename;
51323	51417
51324	51418	if( osCygwin_conv_path && !(winIsDriveLetterAndColon(zFilename)
51325	51419	&& winIsDirSep(zFilename[2])) ){
51326		- int nByte;
	51420	+ i64 nByte;
51327	51421	int convertflag = CCP_POSIX_TO_WIN_W;
51328	51422	if( !strchr(zFilename, '/') ) convertflag \|= CCP_RELATIVE;
51329		- nByte = (int)osCygwin_conv_path(convertflag,
	51423	+ nByte = (i64)osCygwin_conv_path(convertflag,
51330	51424	zFilename, 0, 0);
51331	51425	if( nByte>0 ){
51332		- zConverted = sqlite3MallocZero(nByte+12);
	51426	+ zConverted = sqlite3MallocZero(12+(u64)nByte);
51333	51427	if ( zConverted==0 ){
51334	51428	return zConverted;
51335	51429	}
51336	51430	zWideFilename = zConverted;
51337	51431	/* Filenames should be prefixed, except when converted
		@@ -51646,25 +51740,24 @@
51646	51740	assert( n==1 \|\| (flags & SQLITE_SHM_EXCLUSIVE)!=0 );
51647	51741
51648	51742	/* Check that, if this to be a blocking lock, no locks that occur later
51649	51743	** in the following list than the lock being obtained are already held:
51650	51744	**
51651		- ** 1. Checkpointer lock (ofst==1).
51652		- ** 2. Write lock (ofst==0).
51653		- ** 3. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).
	51745	+ ** 1. Recovery lock (ofst==2).
	51746	+ ** 2. Checkpointer lock (ofst==1).
	51747	+ ** 3. Write lock (ofst==0).
	51748	+ ** 4. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).
51654	51749	**
51655	51750	** In other words, if this is a blocking lock, none of the locks that
51656	51751	** occur later in the above list than the lock being obtained may be
51657	51752	** held.
51658		- **
51659		- ** It is not permitted to block on the RECOVER lock.
51660	51753	*/
51661	51754	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
51662	51755	{
51663	51756	u16 lockMask = (p->exclMask\|p->sharedMask);
51664	51757	assert( (flags & SQLITE_SHM_UNLOCK) \|\| pDbFd->iBusyTimeout==0 \|\| (
51665		- (ofst!=2) /* not RECOVER */
	51758	+ (ofst!=2 \|\| lockMask==0)
51666	51759	&& (ofst!=1 \|\| lockMask==0 \|\| lockMask==2)
51667	51760	&& (ofst!=0 \|\| lockMask<3)
51668	51761	&& (ofst<3 \|\| lockMask<(1<<ofst))
51669	51762	));
51670	51763	}
		@@ -52210,31 +52303,10 @@
52210	52303	**
52211	52304	** This division contains the implementation of methods on the
52212	52305	** sqlite3_vfs object.
52213	52306	*/
52214	52307
52215		-#if 0 /* No longer necessary */
52216		-/*
52217		-** Convert a filename from whatever the underlying operating system
52218		-** supports for filenames into UTF-8. Space to hold the result is
52219		-** obtained from malloc and must be freed by the calling function.
52220		-*/
52221		-static char winConvertToUtf8Filename(const void zFilename){
52222		- char *zConverted = 0;
52223		- if( osIsNT() ){
52224		- zConverted = winUnicodeToUtf8(zFilename);
52225		- }
52226		-#ifdef SQLITE_WIN32_HAS_ANSI
52227		- else{
52228		- zConverted = winMbcsToUtf8(zFilename, osAreFileApisANSI());
52229		- }
52230		-#endif
52231		- /* caller will handle out of memory */
52232		- return zConverted;
52233		-}
52234		-#endif
52235		-
52236	52308	/*
52237	52309	** This function returns non-zero if the specified UTF-8 string buffer
52238	52310	** ends with a directory separator character or one was successfully
52239	52311	** added to it.
52240	52312	*/
		@@ -52370,46 +52442,10 @@
52370	52442	sqlite3_snprintf(nMax, zBuf, "%s", zDir);
52371	52443	sqlite3_free(zConverted);
52372	52444	break;
52373	52445	}
52374	52446	sqlite3_free(zConverted);
52375		-#if 0 /* No longer necessary */
52376		- }else{
52377		- zConverted = sqlite3MallocZero( nMax+1 );
52378		- if( !zConverted ){
52379		- sqlite3_free(zBuf);
52380		- OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
52381		- return SQLITE_IOERR_NOMEM_BKPT;
52382		- }
52383		- if( osCygwin_conv_path(
52384		- CCP_POSIX_TO_WIN_W, zDir,
52385		- zConverted, nMax+1)<0 ){
52386		- sqlite3_free(zConverted);
52387		- sqlite3_free(zBuf);
52388		- OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_CONVPATH\n"));
52389		- return winLogError(SQLITE_IOERR_CONVPATH, (DWORD)errno,
52390		- "winGetTempname2", zDir);
52391		- }
52392		- if( winIsDir(zConverted) ){
52393		- /* At this point, we know the candidate directory exists and should
52394		- ** be used. However, we may need to convert the string containing
52395		- ** its name into UTF-8 (i.e. if it is UTF-16 right now).
52396		- */
52397		- char *zUtf8 = winConvertToUtf8Filename(zConverted);
52398		- if( !zUtf8 ){
52399		- sqlite3_free(zConverted);
52400		- sqlite3_free(zBuf);
52401		- OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
52402		- return SQLITE_IOERR_NOMEM_BKPT;
52403		- }
52404		- sqlite3_snprintf(nMax, zBuf, "%s", zUtf8);
52405		- sqlite3_free(zUtf8);
52406		- sqlite3_free(zConverted);
52407		- break;
52408		- }
52409		- sqlite3_free(zConverted);
52410		-#endif /* No longer necessary */
52411	52447	}
52412	52448	}
52413	52449	}
52414	52450	#endif
52415	52451
		@@ -53304,38 +53340,10 @@
53304	53340	winSimplifyName(zFull);
53305	53341	return rc;
53306	53342	}
53307	53343	}
53308	53344	#endif /* __CYGWIN__ */
53309		-#if 0 /* This doesn't work correctly at all! See:
53310		- <https://marc.info/?l=sqlite-users&m=139299149416314&w=2>
53311		-*/
53312		- SimulateIOError( return SQLITE_ERROR );
53313		- UNUSED_PARAMETER(nFull);
53314		- assert( nFull>=pVfs->mxPathname );
53315		- char *zOut = sqlite3MallocZero( pVfs->mxPathname+1 );
53316		- if( !zOut ){
53317		- return SQLITE_IOERR_NOMEM_BKPT;
53318		- }
53319		- if( osCygwin_conv_path(
53320		- CCP_POSIX_TO_WIN_W,
53321		- zRelative, zOut, pVfs->mxPathname+1)<0 ){
53322		- sqlite3_free(zOut);
53323		- return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
53324		- "winFullPathname2", zRelative);
53325		- }else{
53326		- char *zUtf8 = winConvertToUtf8Filename(zOut);
53327		- if( !zUtf8 ){
53328		- sqlite3_free(zOut);
53329		- return SQLITE_IOERR_NOMEM_BKPT;
53330		- }
53331		- sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zUtf8);
53332		- sqlite3_free(zUtf8);
53333		- sqlite3_free(zOut);
53334		- }
53335		- return SQLITE_OK;
53336		-#endif
53337	53345
53338	53346	#if (SQLITE_OS_WINCE \|\| SQLITE_OS_WINRT) && defined(_WIN32)
53339	53347	SimulateIOError( return SQLITE_ERROR );
53340	53348	/* WinCE has no concept of a relative pathname, or so I am told. */
53341	53349	/* WinRT has no way to convert a relative path to an absolute one. */
		@@ -53477,31 +53485,12 @@
53477	53485	** Interfaces for opening a shared library, finding entry points
53478	53486	** within the shared library, and closing the shared library.
53479	53487	*/
53480	53488	static void winDlOpen(sqlite3_vfs pVfs, const char *zFilename){
53481	53489	HANDLE h;
53482		-#if 0 /* This doesn't work correctly at all! See:
53483		- <https://marc.info/?l=sqlite-users&m=139299149416314&w=2>
53484		-*/
53485		- int nFull = pVfs->mxPathname+1;
53486		- char *zFull = sqlite3MallocZero( nFull );
53487		- void *zConverted = 0;
53488		- if( zFull==0 ){
53489		- OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53490		- return 0;
53491		- }
53492		- if( winFullPathname(pVfs, zFilename, nFull, zFull)!=SQLITE_OK ){
53493		- sqlite3_free(zFull);
53494		- OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53495		- return 0;
53496		- }
53497		- zConverted = winConvertFromUtf8Filename(zFull);
53498		- sqlite3_free(zFull);
53499		-#else
53500	53490	void *zConverted = winConvertFromUtf8Filename(zFilename);
53501	53491	UNUSED_PARAMETER(pVfs);
53502		-#endif
53503	53492	if( zConverted==0 ){
53504	53493	OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53505	53494	return 0;
53506	53495	}
53507	53496	if( osIsNT() ){
		@@ -54943,10 +54932,11 @@
54943	54932	BITVEC_TELEM aBitmap[BITVEC_NELEM]; /* Bitmap representation */
54944	54933	u32 aHash[BITVEC_NINT]; /* Hash table representation */
54945	54934	Bitvec apSub[BITVEC_NPTR]; / Recursive representation */
54946	54935	} u;
54947	54936	};
	54937	+
54948	54938
54949	54939	/*
54950	54940	** Create a new bitmap object able to handle bits between 0 and iSize,
54951	54941	** inclusive. Return a pointer to the new object. Return NULL if
54952	54942	** malloc fails.
		@@ -55053,11 +55043,13 @@
55053	55043	if( aiValues==0 ){
55054	55044	return SQLITE_NOMEM_BKPT;
55055	55045	}else{
55056	55046	memcpy(aiValues, p->u.aHash, sizeof(p->u.aHash));
55057	55047	memset(p->u.apSub, 0, sizeof(p->u.apSub));
55058		- p->iDivisor = (p->iSize + BITVEC_NPTR - 1)/BITVEC_NPTR;
	55048	+ p->iDivisor = p->iSize/BITVEC_NPTR;
	55049	+ if( (p->iSize%BITVEC_NPTR)!=0 ) p->iDivisor++;
	55050	+ if( p->iDivisor<BITVEC_NBIT ) p->iDivisor = BITVEC_NBIT;
55059	55051	rc = sqlite3BitvecSet(p, i);
55060	55052	for(j=0; j<BITVEC_NINT; j++){
55061	55053	if( aiValues[j] ) rc \|= sqlite3BitvecSet(p, aiValues[j]);
55062	55054	}
55063	55055	sqlite3StackFree(0, aiValues);
		@@ -55129,10 +55121,56 @@
55129	55121	** was created.
55130	55122	*/
55131	55123	SQLITE_PRIVATE u32 sqlite3BitvecSize(Bitvec *p){
55132	55124	return p->iSize;
55133	55125	}
	55126	+
	55127	+#ifdef SQLITE_DEBUG
	55128	+/*
	55129	+** Show the content of a Bitvec option and its children. Indent
	55130	+** everything by n spaces. Add x to each bitvec value.
	55131	+**
	55132	+** From a debugger such as gdb, one can type:
	55133	+**
	55134	+** call sqlite3ShowBitvec(p)
	55135	+**
	55136	+** For some Bitvec p and see a recursive view of the Bitvec's content.
	55137	+*/
	55138	+static void showBitvec(Bitvec *p, int n, unsigned x){
	55139	+ int i;
	55140	+ if( p==0 ){
	55141	+ printf("NULL\n");
	55142	+ return;
	55143	+ }
	55144	+ printf("Bitvec 0x%p iSize=%u", p, p->iSize);
	55145	+ if( p->iSize<=BITVEC_NBIT ){
	55146	+ printf(" bitmap\n");
	55147	+ printf("%*s bits:", n, "");
	55148	+ for(i=1; i<=BITVEC_NBIT; i++){
	55149	+ if( sqlite3BitvecTest(p,i) ) printf(" %u", x+(unsigned)i);
	55150	+ }
	55151	+ printf("\n");
	55152	+ }else if( p->iDivisor==0 ){
	55153	+ printf(" hash with %u entries\n", p->nSet);
	55154	+ printf("%*s bits:", n, "");
	55155	+ for(i=0; i<BITVEC_NINT; i++){
	55156	+ if( p->u.aHash[i] ) printf(" %u", x+(unsigned)p->u.aHash[i]);
	55157	+ }
	55158	+ printf("\n");
	55159	+ }else{
	55160	+ printf(" sub-bitvec with iDivisor=%u\n", p->iDivisor);
	55161	+ for(i=0; i<BITVEC_NPTR; i++){
	55162	+ if( p->u.apSub[i]==0 ) continue;
	55163	+ printf("%*s apSub[%d]=", n, "", i);
	55164	+ showBitvec(p->u.apSub[i], n+4, i*p->iDivisor);
	55165	+ }
	55166	+ }
	55167	+}
	55168	+SQLITE_PRIVATE void sqlite3ShowBitvec(Bitvec *p){
	55169	+ showBitvec(p, 0, 0);
	55170	+}
	55171	+#endif
55134	55172
55135	55173	#ifndef SQLITE_UNTESTABLE
55136	55174	/*
55137	55175	** Let V[] be an array of unsigned characters sufficient to hold
55138	55176	** up to N bits. Let I be an integer between 0 and N. 0<=I<N.
		@@ -55140,40 +55178,48 @@
55140	55178	** individual bits within V.
55141	55179	*/
55142	55180	#define SETBIT(V,I) V[I>>3] \|= (1<<(I&7))
55143	55181	#define CLEARBIT(V,I) V[I>>3] &= ~(BITVEC_TELEM)(1<<(I&7))
55144	55182	#define TESTBIT(V,I) (V[I>>3]&(1<<(I&7)))!=0
	55183	+
55145	55184
55146	55185	/*
55147	55186	** This routine runs an extensive test of the Bitvec code.
55148	55187	**
55149	55188	** The input is an array of integers that acts as a program
55150	55189	** to test the Bitvec. The integers are opcodes followed
55151	55190	** by 0, 1, or 3 operands, depending on the opcode. Another
55152	55191	** opcode follows immediately after the last operand.
55153	55192	**
55154		-** There are 6 opcodes numbered from 0 through 5. 0 is the
	55193	+** There are opcodes numbered starting with 0. 0 is the
55155	55194	** "halt" opcode and causes the test to end.
55156	55195	**
55157	55196	** 0 Halt and return the number of errors
55158	55197	** 1 N S X Set N bits beginning with S and incrementing by X
55159	55198	** 2 N S X Clear N bits beginning with S and incrementing by X
55160	55199	** 3 N Set N randomly chosen bits
55161	55200	** 4 N Clear N randomly chosen bits
55162	55201	** 5 N S X Set N bits from S increment X in array only, not in bitvec
	55202	+** 6 Invoice sqlite3ShowBitvec() on the Bitvec object so far
	55203	+** 7 X Show compile-time parameters and the hash of X
55163	55204	**
55164	55205	** The opcodes 1 through 4 perform set and clear operations are performed
55165	55206	** on both a Bitvec object and on a linear array of bits obtained from malloc.
55166	55207	** Opcode 5 works on the linear array only, not on the Bitvec.
55167	55208	** Opcode 5 is used to deliberately induce a fault in order to
55168		-** confirm that error detection works.
	55209	+** confirm that error detection works. Opcodes 6 and greater are
	55210	+** state output opcodes. Opcodes 6 and greater are no-ops unless
	55211	+** SQLite has been compiled with SQLITE_DEBUG.
55169	55212	**
55170	55213	** At the conclusion of the test the linear array is compared
55171	55214	** against the Bitvec object. If there are any differences,
55172	55215	** an error is returned. If they are the same, zero is returned.
55173	55216	**
55174	55217	** If a memory allocation error occurs, return -1.
	55218	+**
	55219	+** sz is the size of the Bitvec. Or if sz is negative, make the size
	55220	+** 2*(unsigned)(-sz) and disabled the linear vector check.
55175	55221	*/
55176	55222	SQLITE_PRIVATE int sqlite3BitvecBuiltinTest(int sz, int *aOp){
55177	55223	Bitvec *pBitvec = 0;
55178	55224	unsigned char *pV = 0;
55179	55225	int rc = -1;
		@@ -55180,22 +55226,45 @@
55180	55226	int i, nx, pc, op;
55181	55227	void *pTmpSpace;
55182	55228
55183	55229	/* Allocate the Bitvec to be tested and a linear array of
55184	55230	** bits to act as the reference */
55185		- pBitvec = sqlite3BitvecCreate( sz );
55186		- pV = sqlite3MallocZero( (7+(i64)sz)/8 + 1 );
	55231	+ if( sz<=0 ){
	55232	+ pBitvec = sqlite3BitvecCreate( 2*(unsigned)(-sz) );
	55233	+ pV = 0;
	55234	+ }else{
	55235	+ pBitvec = sqlite3BitvecCreate( sz );
	55236	+ pV = sqlite3MallocZero( (7+(i64)sz)/8 + 1 );
	55237	+ }
55187	55238	pTmpSpace = sqlite3_malloc64(BITVEC_SZ);
55188		- if( pBitvec==0 \|\| pV==0 \|\| pTmpSpace==0 ) goto bitvec_end;
	55239	+ if( pBitvec==0 \|\| pTmpSpace==0 \|\| (pV==0 && sz>0) ) goto bitvec_end;
55189	55240
55190	55241	/* NULL pBitvec tests */
55191	55242	sqlite3BitvecSet(0, 1);
55192	55243	sqlite3BitvecClear(0, 1, pTmpSpace);
55193	55244
55194	55245	/* Run the program */
55195	55246	pc = i = 0;
55196	55247	while( (op = aOp[pc])!=0 ){
	55248	+ if( op>=6 ){
	55249	+#ifdef SQLITE_DEBUG
	55250	+ if( op==6 ){
	55251	+ sqlite3ShowBitvec(pBitvec);
	55252	+ }else if( op==7 ){
	55253	+ printf("BITVEC_SZ = %d (%d by sizeof)\n",
	55254	+ BITVEC_SZ, (int)sizeof(Bitvec));
	55255	+ printf("BITVEC_USIZE = %d\n", (int)BITVEC_USIZE);
	55256	+ printf("BITVEC_NELEM = %d\n", (int)BITVEC_NELEM);
	55257	+ printf("BITVEC_NBIT = %d\n", (int)BITVEC_NBIT);
	55258	+ printf("BITVEC_NINT = %d\n", (int)BITVEC_NINT);
	55259	+ printf("BITVEC_MXHASH = %d\n", (int)BITVEC_MXHASH);
	55260	+ printf("BITVEC_NPTR = %d\n", (int)BITVEC_NPTR);
	55261	+ }
	55262	+#endif
	55263	+ pc++;
	55264	+ continue;
	55265	+ }
55197	55266	switch( op ){
55198	55267	case 1:
55199	55268	case 2:
55200	55269	case 5: {
55201	55270	nx = 4;
		@@ -55213,33 +55282,37 @@
55213	55282	}
55214	55283	if( (--aOp[pc+1]) > 0 ) nx = 0;
55215	55284	pc += nx;
55216	55285	i = (i & 0x7fffffff)%sz;
55217	55286	if( (op & 1)!=0 ){
55218		- SETBIT(pV, (i+1));
	55287	+ if( pV ) SETBIT(pV, (i+1));
55219	55288	if( op!=5 ){
55220	55289	if( sqlite3BitvecSet(pBitvec, i+1) ) goto bitvec_end;
55221	55290	}
55222	55291	}else{
55223		- CLEARBIT(pV, (i+1));
	55292	+ if( pV ) CLEARBIT(pV, (i+1));
55224	55293	sqlite3BitvecClear(pBitvec, i+1, pTmpSpace);
55225	55294	}
55226	55295	}
55227	55296
55228	55297	/* Test to make sure the linear array exactly matches the
55229	55298	** Bitvec object. Start with the assumption that they do
55230	55299	** match (rc==0). Change rc to non-zero if a discrepancy
55231	55300	** is found.
55232	55301	*/
55233		- rc = sqlite3BitvecTest(0,0) + sqlite3BitvecTest(pBitvec, sz+1)
55234		- + sqlite3BitvecTest(pBitvec, 0)
55235		- + (sqlite3BitvecSize(pBitvec) - sz);
55236		- for(i=1; i<=sz; i++){
55237		- if( (TESTBIT(pV,i))!=sqlite3BitvecTest(pBitvec,i) ){
55238		- rc = i;
55239		- break;
55240		- }
	55302	+ if( pV ){
	55303	+ rc = sqlite3BitvecTest(0,0) + sqlite3BitvecTest(pBitvec, sz+1)
	55304	+ + sqlite3BitvecTest(pBitvec, 0)
	55305	+ + (sqlite3BitvecSize(pBitvec) - sz);
	55306	+ for(i=1; i<=sz; i++){
	55307	+ if( (TESTBIT(pV,i))!=sqlite3BitvecTest(pBitvec,i) ){
	55308	+ rc = i;
	55309	+ break;
	55310	+ }
	55311	+ }
	55312	+ }else{
	55313	+ rc = 0;
55241	55314	}
55242	55315
55243	55316	/* Free allocated structure */
55244	55317	bitvec_end:
55245	55318	sqlite3_free(pTmpSpace);
		@@ -58839,10 +58912,13 @@
58839	58912	char pTmpSpace; / Pager.pageSize bytes of space for tmp use */
58840	58913	PCache pPCache; / Pointer to page cache object */
58841	58914	#ifndef SQLITE_OMIT_WAL
58842	58915	Wal pWal; / Write-ahead log used by "journal_mode=wal" */
58843	58916	char zWal; / File name for write-ahead log */
	58917	+#endif
	58918	+#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
	58919	+ sqlite3 *dbWal;
58844	58920	#endif
58845	58921	};
58846	58922
58847	58923	/*
58848	58924	** Indexes for use with Pager.aStat[]. The Pager.aStat[] array contains
		@@ -65721,10 +65797,15 @@
65721	65797	if( rc==SQLITE_OK ){
65722	65798	rc = sqlite3WalOpen(pPager->pVfs,
65723	65799	pPager->fd, pPager->zWal, pPager->exclusiveMode,
65724	65800	pPager->journalSizeLimit, &pPager->pWal
65725	65801	);
	65802	+#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
	65803	+ if( rc==SQLITE_OK ){
	65804	+ sqlite3WalDb(pPager->pWal, pPager->dbWal);
	65805	+ }
	65806	+#endif
65726	65807	}
65727	65808	pagerFixMaplimit(pPager);
65728	65809
65729	65810	return rc;
65730	65811	}
		@@ -65840,10 +65921,11 @@
65840	65921	/*
65841	65922	** Set the database handle used by the wal layer to determine if
65842	65923	** blocking locks are required.
65843	65924	*/
65844	65925	SQLITE_PRIVATE void sqlite3PagerWalDb(Pager pPager, sqlite3 db){
	65926	+ pPager->dbWal = db;
65845	65927	if( pagerUseWal(pPager) ){
65846	65928	sqlite3WalDb(pPager->pWal, db);
65847	65929	}
65848	65930	}
65849	65931	#endif
		@@ -69013,11 +69095,10 @@
69013	69095	assert( rc==SQLITE_OK );
69014	69096	if( pWal->bShmUnreliable==0 ){
69015	69097	rc = walIndexReadHdr(pWal, pChanged);
69016	69098	}
69017	69099	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
69018		- walDisableBlocking(pWal);
69019	69100	if( rc==SQLITE_BUSY_TIMEOUT ){
69020	69101	rc = SQLITE_BUSY;
69021	69102	*pCnt \|= WAL_RETRY_BLOCKED_MASK;
69022	69103	}
69023	69104	#endif
		@@ -69028,10 +69109,11 @@
69028	69109	** which might cause WAL_RETRY to be returned even if BUSY_RECOVERY
69029	69110	** would be technically correct. But the race is benign since with
69030	69111	** WAL_RETRY this routine will be called again and will probably be
69031	69112	** right on the second iteration.
69032	69113	*/
	69114	+ (void)walEnableBlocking(pWal);
69033	69115	if( pWal->apWiData[0]==0 ){
69034	69116	/* This branch is taken when the xShmMap() method returns SQLITE_BUSY.
69035	69117	** We assume this is a transient condition, so return WAL_RETRY. The
69036	69118	** xShmMap() implementation used by the default unix and win32 VFS
69037	69119	** modules may return SQLITE_BUSY due to a race condition in the
		@@ -69044,10 +69126,11 @@
69044	69126	rc = WAL_RETRY;
69045	69127	}else if( rc==SQLITE_BUSY ){
69046	69128	rc = SQLITE_BUSY_RECOVERY;
69047	69129	}
69048	69130	}
	69131	+ walDisableBlocking(pWal);
69049	69132	if( rc!=SQLITE_OK ){
69050	69133	return rc;
69051	69134	}
69052	69135	else if( pWal->bShmUnreliable ){
69053	69136	return walBeginShmUnreliable(pWal, pChanged);
		@@ -69731,10 +69814,11 @@
69731	69814	rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
69732	69815	}
69733	69816	if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
69734	69817	}
69735	69818	SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
	69819	+ pWal->iReCksum = 0;
69736	69820	}
69737	69821	return rc;
69738	69822	}
69739	69823
69740	69824	/*
		@@ -69778,10 +69862,13 @@
69778	69862	pWal->hdr.aFrameCksum[1] = aWalData[2];
69779	69863	SEH_TRY {
69780	69864	walCleanupHash(pWal);
69781	69865	}
69782	69866	SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
	69867	+ if( pWal->iReCksum>pWal->hdr.mxFrame ){
	69868	+ pWal->iReCksum = 0;
	69869	+ }
69783	69870	}
69784	69871
69785	69872	return rc;
69786	69873	}
69787	69874
		@@ -72493,11 +72580,11 @@
72493	72580	if( pKey ){
72494	72581	KeyInfo *pKeyInfo = pCur->pKeyInfo;
72495	72582	assert( nKey==(i64)(int)nKey );
72496	72583	pIdxKey = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
72497	72584	if( pIdxKey==0 ) return SQLITE_NOMEM_BKPT;
72498		- sqlite3VdbeRecordUnpack(pKeyInfo, (int)nKey, pKey, pIdxKey);
	72585	+ sqlite3VdbeRecordUnpack((int)nKey, pKey, pIdxKey);
72499	72586	if( pIdxKey->nField==0 \|\| pIdxKey->nField>pKeyInfo->nAllField ){
72500	72587	rc = SQLITE_CORRUPT_BKPT;
72501	72588	}else{
72502	72589	rc = sqlite3BtreeIndexMoveto(pCur, pIdxKey, pRes);
72503	72590	}
		@@ -73550,14 +73637,14 @@
73550	73637	u8 pTmp; / Temporary ptr into data[] */
73551	73638
73552	73639	assert( pPage->pBt!=0 );
73553	73640	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
73554	73641	assert( CORRUPT_DB \|\| iStart>=pPage->hdrOffset+6+pPage->childPtrSize );
73555		- assert( CORRUPT_DB \|\| iEnd <= pPage->pBt->usableSize );
	73642	+ assert( CORRUPT_DB \|\| iEnd <= (int)pPage->pBt->usableSize );
73556	73643	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
73557	73644	assert( iSize>=4 ); /* Minimum cell size is 4 */
73558		- assert( CORRUPT_DB \|\| iStart<=pPage->pBt->usableSize-4 );
	73645	+ assert( CORRUPT_DB \|\| iStart<=(int)pPage->pBt->usableSize-4 );
73559	73646
73560	73647	/* The list of freeblocks must be in ascending order. Find the
73561	73648	** spot on the list where iStart should be inserted.
73562	73649	*/
73563	73650	hdr = pPage->hdrOffset;
		@@ -74477,10 +74564,11 @@
74477	74564	removed = 1;
74478	74565	}
74479	74566	sqlite3_mutex_leave(pMainMtx);
74480	74567	return removed;
74481	74568	#else
	74569	+ UNUSED_PARAMETER( pBt );
74482	74570	return 1;
74483	74571	#endif
74484	74572	}
74485	74573
74486	74574	/*
		@@ -74694,10 +74782,14 @@
74694	74782	BtShared *pBt = p->pBt;
74695	74783	assert( nReserve>=0 && nReserve<=255 );
74696	74784	sqlite3BtreeEnter(p);
74697	74785	pBt->nReserveWanted = (u8)nReserve;
74698	74786	x = pBt->pageSize - pBt->usableSize;
	74787	+ if( x==nReserve && (pageSize==0 \|\| (u32)pageSize==pBt->pageSize) ){
	74788	+ sqlite3BtreeLeave(p);
	74789	+ return SQLITE_OK;
	74790	+ }
74699	74791	if( nReserve<x ) nReserve = x;
74700	74792	if( pBt->btsFlags & BTS_PAGESIZE_FIXED ){
74701	74793	sqlite3BtreeLeave(p);
74702	74794	return SQLITE_READONLY;
74703	74795	}
		@@ -75318,10 +75410,17 @@
75318	75410
75319	75411	if( rc!=SQLITE_OK ){
75320	75412	(void)sqlite3PagerWalWriteLock(pPager, 0);
75321	75413	unlockBtreeIfUnused(pBt);
75322	75414	}
	75415	+#if defined(SQLITE_ENABLE_SETLK_TIMEOUT)
	75416	+ if( rc==SQLITE_BUSY_TIMEOUT ){
	75417	+ /* If a blocking lock timed out, break out of the loop here so that
	75418	+ ** the busy-handler is not invoked. */
	75419	+ break;
	75420	+ }
	75421	+#endif
75323	75422	}while( (rc&0xFF)==SQLITE_BUSY && pBt->inTransaction==TRANS_NONE &&
75324	75423	btreeInvokeBusyHandler(pBt) );
75325	75424	sqlite3PagerWalDb(pPager, 0);
75326	75425	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
75327	75426	if( rc==SQLITE_BUSY_TIMEOUT ) rc = SQLITE_BUSY;
		@@ -77275,10 +77374,34 @@
77275	77374	*pRes = 1;
77276	77375	rc = SQLITE_OK;
77277	77376	}
77278	77377	return rc;
77279	77378	}
	77379	+
	77380	+/* Set *pRes to 1 (true) if the BTree pointed to by cursor pCur contains zero
	77381	+** rows of content. Set *pRes to 0 (false) if the table contains content.
	77382	+** Return SQLITE_OK on success or some error code (ex: SQLITE_NOMEM) if
	77383	+** something goes wrong.
	77384	+*/
	77385	+SQLITE_PRIVATE int sqlite3BtreeIsEmpty(BtCursor pCur, int pRes){
	77386	+ int rc;
	77387	+
	77388	+ assert( cursorOwnsBtShared(pCur) );
	77389	+ assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
	77390	+ if( pCur->eState==CURSOR_VALID ){
	77391	+ *pRes = 0;
	77392	+ return SQLITE_OK;
	77393	+ }
	77394	+ rc = moveToRoot(pCur);
	77395	+ if( rc==SQLITE_EMPTY ){
	77396	+ *pRes = 1;
	77397	+ rc = SQLITE_OK;
	77398	+ }else{
	77399	+ *pRes = 0;
	77400	+ }
	77401	+ return rc;
	77402	+}
77280	77403
77281	77404	#ifdef SQLITE_DEBUG
77282	77405	/* The cursors is CURSOR_VALID and has BTCF_AtLast set. Verify that
77283	77406	** this flags are true for a consistent database.
77284	77407	**
		@@ -77495,12 +77618,12 @@
77495	77618	assert( (pCur->curFlags & BTCF_ValidOvfl)==0 );
77496	77619	return rc;
77497	77620	}
77498	77621
77499	77622	/*
77500		-** Compare the "idx"-th cell on the page the cursor pCur is currently
77501		-** pointing to to pIdxKey using xRecordCompare. Return negative or
	77623	+** Compare the "idx"-th cell on the page pPage against the key
	77624	+** pointing to by pIdxKey using xRecordCompare. Return negative or
77502	77625	** zero if the cell is less than or equal pIdxKey. Return positive
77503	77626	** if unknown.
77504	77627	**
77505	77628	** Return value negative: Cell at pCur[idx] less than pIdxKey
77506	77629	**
		@@ -77511,16 +77634,15 @@
77511	77634	**
77512	77635	** This routine is part of an optimization. It is always safe to return
77513	77636	** a positive value as that will cause the optimization to be skipped.
77514	77637	*/
77515	77638	static int indexCellCompare(
77516		- BtCursor *pCur,
	77639	+ MemPage *pPage,
77517	77640	int idx,
77518	77641	UnpackedRecord *pIdxKey,
77519	77642	RecordCompare xRecordCompare
77520	77643	){
77521		- MemPage *pPage = pCur->pPage;
77522	77644	int c;
77523	77645	int nCell; /* Size of the pCell cell in bytes */
77524	77646	u8 *pCell = findCellPastPtr(pPage, idx);
77525	77647
77526	77648	nCell = pCell[0];
		@@ -77625,18 +77747,18 @@
77625	77747	&& pCur->pPage->leaf
77626	77748	&& cursorOnLastPage(pCur)
77627	77749	){
77628	77750	int c;
77629	77751	if( pCur->ix==pCur->pPage->nCell-1
77630		- && (c = indexCellCompare(pCur, pCur->ix, pIdxKey, xRecordCompare))<=0
	77752	+ && (c = indexCellCompare(pCur->pPage,pCur->ix,pIdxKey,xRecordCompare))<=0
77631	77753	&& pIdxKey->errCode==SQLITE_OK
77632	77754	){
77633	77755	*pRes = c;
77634	77756	return SQLITE_OK; /* Cursor already pointing at the correct spot */
77635	77757	}
77636	77758	if( pCur->iPage>0
77637		- && indexCellCompare(pCur, 0, pIdxKey, xRecordCompare)<=0
	77759	+ && indexCellCompare(pCur->pPage, 0, pIdxKey, xRecordCompare)<=0
77638	77760	&& pIdxKey->errCode==SQLITE_OK
77639	77761	){
77640	77762	pCur->curFlags &= ~(BTCF_ValidOvfl\|BTCF_AtLast);
77641	77763	if( !pCur->pPage->isInit ){
77642	77764	return SQLITE_CORRUPT_BKPT;
		@@ -77849,11 +77971,11 @@
77849	77971	if( pCur->eState!=CURSOR_VALID ) return 0;
77850	77972	if( NEVER(pCur->pPage->leaf==0) ) return -1;
77851	77973
77852	77974	n = pCur->pPage->nCell;
77853	77975	for(i=0; i<pCur->iPage; i++){
77854		- n *= pCur->apPage[i]->nCell;
	77976	+ n *= pCur->apPage[i]->nCell+1;
77855	77977	}
77856	77978	return n;
77857	77979	}
77858	77980
77859	77981	/*
		@@ -80306,11 +80428,16 @@
80306	80428
80307	80429	/* If the sibling pages are not leaves, ensure that the right-child pointer
80308	80430	** of the right-most new sibling page is set to the value that was
80309	80431	** originally in the same field of the right-most old sibling page. */
80310	80432	if( (pageFlags & PTF_LEAF)==0 && nOld!=nNew ){
80311		- MemPage *pOld = (nNew>nOld ? apNew : apOld)[nOld-1];
	80433	+ MemPage *pOld;
	80434	+ if( nNew>nOld ){
	80435	+ pOld = apNew[nOld-1];
	80436	+ }else{
	80437	+ pOld = apOld[nOld-1];
	80438	+ }
80312	80439	memcpy(&apNew[nNew-1]->aData[8], &pOld->aData[8], 4);
80313	80440	}
80314	80441
80315	80442	/* Make any required updates to pointer map entries associated with
80316	80443	** cells stored on sibling pages following the balance operation. Pointer
		@@ -82938,10 +83065,11 @@
82938	83065	** btree as the argument handle holds an exclusive lock on the
82939	83066	** sqlite_schema table. Otherwise SQLITE_OK.
82940	83067	*/
82941	83068	SQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *p){
82942	83069	int rc;
	83070	+ UNUSED_PARAMETER(p); /* only used in DEBUG builds */
82943	83071	assert( sqlite3_mutex_held(p->db->mutex) );
82944	83072	sqlite3BtreeEnter(p);
82945	83073	rc = querySharedCacheTableLock(p, SCHEMA_ROOT, READ_LOCK);
82946	83074	assert( rc==SQLITE_OK \|\| rc==SQLITE_LOCKED_SHAREDCACHE );
82947	83075	sqlite3BtreeLeave(p);
		@@ -87262,10 +87390,13 @@
87262	87390	** into register iDest, then add the OPFLAG_TYPEOFARG flag to that
87263	87391	** opcode.
87264	87392	*/
87265	87393	SQLITE_PRIVATE void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
87266	87394	VdbeOp *pOp = sqlite3VdbeGetLastOp(p);
	87395	+#ifdef SQLITE_DEBUG
	87396	+ while( pOp->opcode==OP_ReleaseReg ) pOp--;
	87397	+#endif
87267	87398	if( pOp->p3==iDest && pOp->opcode==OP_Column ){
87268	87399	pOp->p5 \|= OPFLAG_TYPEOFARG;
87269	87400	}
87270	87401	}
87271	87402
		@@ -90155,34 +90286,26 @@
90155	90286	}
90156	90287	}
90157	90288	return;
90158	90289	}
90159	90290	/*
90160		-** This routine is used to allocate sufficient space for an UnpackedRecord
90161		-** structure large enough to be used with sqlite3VdbeRecordUnpack() if
90162		-** the first argument is a pointer to KeyInfo structure pKeyInfo.
90163		-**
90164		-** The space is either allocated using sqlite3DbMallocRaw() or from within
90165		-** the unaligned buffer passed via the second and third arguments (presumably
90166		-** stack space). If the former, then *ppFree is set to a pointer that should
90167		-** be eventually freed by the caller using sqlite3DbFree(). Or, if the
90168		-** allocation comes from the pSpace/szSpace buffer, *ppFree is set to NULL
90169		-** before returning.
90170		-**
90171		-** If an OOM error occurs, NULL is returned.
	90291	+** Allocate sufficient space for an UnpackedRecord structure large enough
	90292	+** to hold a decoded index record for pKeyInfo.
	90293	+**
	90294	+** The space is allocated using sqlite3DbMallocRaw(). If an OOM error
	90295	+** occurs, NULL is returned.
90172	90296	*/
90173	90297	SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(
90174	90298	KeyInfo pKeyInfo / Description of the record */
90175	90299	){
90176	90300	UnpackedRecord p; / Unpacked record to return */
90177		- int nByte; /* Number of bytes required for p /
	90301	+ u64 nByte; /* Number of bytes required for p /
90178	90302	assert( sizeof(UnpackedRecord) + sizeof(Mem)*65536 < 0x7fffffff );
90179	90303	nByte = ROUND8P(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1);
90180	90304	p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte);
90181	90305	if( !p ) return 0;
90182	90306	p->aMem = (Mem)&((char)p)[ROUND8P(sizeof(UnpackedRecord))];
90183		- assert( pKeyInfo->aSortFlags!=0 );
90184	90307	p->pKeyInfo = pKeyInfo;
90185	90308	p->nField = pKeyInfo->nKeyField + 1;
90186	90309	return p;
90187	90310	}
90188	90311
		@@ -90190,11 +90313,10 @@
90190	90313	** Given the nKey-byte encoding of a record in pKey[], populate the
90191	90314	** UnpackedRecord structure indicated by the fourth argument with the
90192	90315	** contents of the decoded record.
90193	90316	*/
90194	90317	SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(
90195		- KeyInfo pKeyInfo, / Information about the record format */
90196	90318	int nKey, /* Size of the binary record */
90197	90319	const void pKey, / The binary record */
90198	90320	UnpackedRecord p / Populate this structure before returning. */
90199	90321	){
90200	90322	const unsigned char aKey = (const unsigned char )pKey;
		@@ -90201,10 +90323,11 @@
90201	90323	u32 d;
90202	90324	u32 idx; /* Offset in aKey[] to read from */
90203	90325	u16 u; /* Unsigned loop counter */
90204	90326	u32 szHdr;
90205	90327	Mem *pMem = p->aMem;
	90328	+ KeyInfo *pKeyInfo = p->pKeyInfo;
90206	90329
90207	90330	p->default_rc = 0;
90208	90331	assert( EIGHT_BYTE_ALIGNMENT(pMem) );
90209	90332	idx = getVarint32(aKey, szHdr);
90210	90333	d = szHdr;
		@@ -90228,10 +90351,12 @@
90228	90351	/* In a corrupt record entry, the last pMem might have been set up using
90229	90352	** uninitialized memory. Overwrite its value with NULL, to prevent
90230	90353	** warnings from MSAN. */
90231	90354	sqlite3VdbeMemSetNull(pMem-1);
90232	90355	}
	90356	+ testcase( u == pKeyInfo->nKeyField + 1 );
	90357	+ testcase( u < pKeyInfo->nKeyField + 1 );
90233	90358	assert( u<=pKeyInfo->nKeyField + 1 );
90234	90359	p->nField = u;
90235	90360	}
90236	90361
90237	90362	#ifdef SQLITE_DEBUG
		@@ -91087,10 +91212,11 @@
91087	91212	** is an integer.
91088	91213	**
91089	91214	** The easiest way to enforce this limit is to consider only records with
91090	91215	** 13 fields or less. If the first field is an integer, the maximum legal
91091	91216	** header size is (125 + 1 + 1) bytes. /
	91217	+ assert( p->pKeyInfo->aSortFlags!=0 );
91092	91218	if( p->pKeyInfo->nAllField<=13 ){
91093	91219	int flags = p->aMem[0].flags;
91094	91220	if( p->pKeyInfo->aSortFlags[0] ){
91095	91221	if( p->pKeyInfo->aSortFlags[0] & KEYINFO_ORDER_BIGNULL ){
91096	91222	return sqlite3VdbeRecordCompare;
		@@ -91336,10 +91462,11 @@
91336	91462	}else{
91337	91463	v->expmask \|= ((u32)1 << (iVar-1));
91338	91464	}
91339	91465	}
91340	91466
	91467	+#ifndef SQLITE_OMIT_DATETIME_FUNCS
91341	91468	/*
91342	91469	** Cause a function to throw an error if it was call from OP_PureFunc
91343	91470	** rather than OP_Function.
91344	91471	**
91345	91472	** OP_PureFunc means that the function must be deterministic, and should
		@@ -91369,10 +91496,11 @@
91369	91496	sqlite3_free(zMsg);
91370	91497	return 0;
91371	91498	}
91372	91499	return 1;
91373	91500	}
	91501	+#endif /* SQLITE_OMIT_DATETIME_FUNCS */
91374	91502
91375	91503	#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
91376	91504	/*
91377	91505	** This Walker callback is used to help verify that calls to
91378	91506	** sqlite3BtreeCursorHint() with opcode BTREE_HINT_RANGE have
		@@ -91445,11 +91573,10 @@
91445	91573	){
91446	91574	sqlite3 *db = v->db;
91447	91575	i64 iKey2;
91448	91576	PreUpdate preupdate;
91449	91577	const char *zTbl = pTab->zName;
91450		- static const u8 fakeSortOrder = 0;
91451	91578	#ifdef SQLITE_DEBUG
91452	91579	int nRealCol;
91453	91580	if( pTab->tabFlags & TF_WithoutRowid ){
91454	91581	nRealCol = sqlite3PrimaryKeyIndex(pTab)->nColumn;
91455	91582	}else if( pTab->tabFlags & TF_HasVirtual ){
		@@ -91484,11 +91611,11 @@
91484	91611	preupdate.iNewReg = iReg;
91485	91612	preupdate.pKeyinfo = (KeyInfo*)&preupdate.keyinfoSpace;
91486	91613	preupdate.pKeyinfo->db = db;
91487	91614	preupdate.pKeyinfo->enc = ENC(db);
91488	91615	preupdate.pKeyinfo->nKeyField = pTab->nCol;
91489		- preupdate.pKeyinfo->aSortFlags = (u8*)&fakeSortOrder;
	91616	+ preupdate.pKeyinfo->aSortFlags = 0; /* Indicate .aColl, .nAllField uninit */
91490	91617	preupdate.iKey1 = iKey1;
91491	91618	preupdate.iKey2 = iKey2;
91492	91619	preupdate.pTab = pTab;
91493	91620	preupdate.iBlobWrite = iBlobWrite;
91494	91621
		@@ -93681,11 +93808,11 @@
93681	93808	UnpackedRecord pRet; / Return value */
93682	93809
93683	93810	pRet = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
93684	93811	if( pRet ){
93685	93812	memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nKeyField+1));
93686		- sqlite3VdbeRecordUnpack(pKeyInfo, nKey, pKey, pRet);
	93813	+ sqlite3VdbeRecordUnpack(nKey, pKey, pRet);
93687	93814	}
93688	93815	return pRet;
93689	93816	}
93690	93817
93691	93818	/*
		@@ -93710,10 +93837,13 @@
93710	93837	rc = SQLITE_MISUSE_BKPT;
93711	93838	goto preupdate_old_out;
93712	93839	}
93713	93840	if( p->pPk ){
93714	93841	iStore = sqlite3TableColumnToIndex(p->pPk, iIdx);
	93842	+ }else if( iIdx >= p->pTab->nCol ){
	93843	+ rc = SQLITE_MISUSE_BKPT;
	93844	+ goto preupdate_old_out;
93715	93845	}else{
93716	93846	iStore = sqlite3TableColumnToStorage(p->pTab, iIdx);
93717	93847	}
93718	93848	if( iStore>=p->pCsr->nField \|\| iStore<0 ){
93719	93849	rc = SQLITE_RANGE;
		@@ -93865,10 +93995,12 @@
93865	93995	rc = SQLITE_MISUSE_BKPT;
93866	93996	goto preupdate_new_out;
93867	93997	}
93868	93998	if( p->pPk && p->op!=SQLITE_UPDATE ){
93869	93999	iStore = sqlite3TableColumnToIndex(p->pPk, iIdx);
	94000	+ }else if( iIdx >= p->pTab->nCol ){
	94001	+ return SQLITE_MISUSE_BKPT;
93870	94002	}else{
93871	94003	iStore = sqlite3TableColumnToStorage(p->pTab, iIdx);
93872	94004	}
93873	94005
93874	94006	if( iStore>=p->pCsr->nField \|\| iStore<0 ){
		@@ -95190,10 +95322,40 @@
95190	95322	}
95191	95323	pDest->flags &= ~MEM_Ephem;
95192	95324	return rc;
95193	95325	}
95194	95326
	95327	+/*
	95328	+** Send a "statement aborts" message to the error log.
	95329	+*/
	95330	+static SQLITE_NOINLINE void sqlite3VdbeLogAbort(
	95331	+ Vdbe p, / The statement that is running at the time of failure */
	95332	+ int rc, /* Error code */
	95333	+ Op pOp, / Opcode that filed */
	95334	+ Op aOp / All opcodes */
	95335	+){
	95336	+ const char zSql = p->zSql; / Original SQL text */
	95337	+ const char zPrefix = ""; / Prefix added to SQL text */
	95338	+ int pc; /* Opcode address */
	95339	+ char zXtra[100]; /* Buffer space to store zPrefix */
	95340	+
	95341	+ if( p->pFrame ){
	95342	+ assert( aOp[0].opcode==OP_Init );
	95343	+ if( aOp[0].p4.z!=0 ){
	95344	+ assert( aOp[0].p4.z[0]=='-'
	95345	+ && aOp[0].p4.z[1]=='-'
	95346	+ && aOp[0].p4.z[2]==' ' );
	95347	+ sqlite3_snprintf(sizeof(zXtra), zXtra,"/* %s */ ",aOp[0].p4.z+3);
	95348	+ zPrefix = zXtra;
	95349	+ }else{
	95350	+ zPrefix = "/* unknown trigger */ ";
	95351	+ }
	95352	+ }
	95353	+ pc = (int)(pOp - aOp);
	95354	+ sqlite3_log(rc, "statement aborts at %d: %s; [%s%s]",
	95355	+ pc, p->zErrMsg, zPrefix, zSql);
	95356	+}
95195	95357
95196	95358	/*
95197	95359	** Return the symbolic name for the data type of a pMem
95198	95360	*/
95199	95361	static const char vdbeMemTypeName(Mem pMem){
		@@ -95715,12 +95877,11 @@
95715	95877	p->zErrMsg = sqlite3MPrintf(db, "%z: %s", p->zErrMsg, pOp->p4.z);
95716	95878	}
95717	95879	}else{
95718	95880	sqlite3VdbeError(p, "%s", pOp->p4.z);
95719	95881	}
95720		- pcx = (int)(pOp - aOp);
95721		- sqlite3_log(pOp->p1, "abort at %d in [%s]: %s", pcx, p->zSql, p->zErrMsg);
	95882	+ sqlite3VdbeLogAbort(p, pOp->p1, pOp, aOp);
95722	95883	}
95723	95884	rc = sqlite3VdbeHalt(p);
95724	95885	assert( rc==SQLITE_BUSY \|\| rc==SQLITE_OK \|\| rc==SQLITE_ERROR );
95725	95886	if( rc==SQLITE_BUSY ){
95726	95887	p->rc = SQLITE_BUSY;
		@@ -96874,10 +97035,11 @@
96874	97035	}
96875	97036	n = pOp->p3;
96876	97037	pKeyInfo = pOp->p4.pKeyInfo;
96877	97038	assert( n>0 );
96878	97039	assert( pKeyInfo!=0 );
	97040	+ assert( pKeyInfo->aSortFlags!=0 );
96879	97041	p1 = pOp->p1;
96880	97042	p2 = pOp->p2;
96881	97043	#ifdef SQLITE_DEBUG
96882	97044	if( aPermute ){
96883	97045	int k, mx = 0;
		@@ -97042,11 +97204,11 @@
97042	97204	pOut->u.i = ~sqlite3VdbeIntValue(pIn1);
97043	97205	}
97044	97206	break;
97045	97207	}
97046	97208
97047		-/* Opcode: Once P1 P2 * * *
	97209	+/* Opcode: Once P1 P2 P3 * *
97048	97210	**
97049	97211	** Fall through to the next instruction the first time this opcode is
97050	97212	** encountered on each invocation of the byte-code program. Jump to P2
97051	97213	** on the second and all subsequent encounters during the same invocation.
97052	97214	**
		@@ -97058,10 +97220,16 @@
97058	97220	**
97059	97221	** For subprograms, there is a bitmask in the VdbeFrame that determines
97060	97222	** whether or not the jump should be taken. The bitmask is necessary
97061	97223	** because the self-altering code trick does not work for recursive
97062	97224	** triggers.
	97225	+**
	97226	+** The P3 operand is not used directly by this opcode. However P3 is
	97227	+** used by the code generator as follows: If this opcode is the start
	97228	+** of a subroutine and that subroutine uses a Bloom filter, then P3 will
	97229	+** be the register that holds that Bloom filter. See tag-202407032019
	97230	+** in the source code for implementation details.
97063	97231	*/
97064	97232	case OP_Once: { /* jump */
97065	97233	u32 iAddr; /* Address of this instruction */
97066	97234	assert( p->aOp[0].opcode==OP_Init );
97067	97235	if( p->pFrame ){
		@@ -97629,10 +97797,19 @@
97629	97797	** Synopsis: typecheck(r[P1@P2])
97630	97798	**
97631	97799	** Apply affinities to the range of P2 registers beginning with P1.
97632	97800	** Take the affinities from the Table object in P4. If any value
97633	97801	** cannot be coerced into the correct type, then raise an error.
	97802	+**
	97803	+** If P3==0, then omit checking of VIRTUAL columns.
	97804	+**
	97805	+** If P3==1, then omit checking of all generated column, both VIRTUAL
	97806	+** and STORED.
	97807	+**
	97808	+** If P3>=2, then only check column number P3-2 in the table (which will
	97809	+** be a VIRTUAL column) against the value in reg[P1]. In this case,
	97810	+** P2 will be 1.
97634	97811	**
97635	97812	** This opcode is similar to OP_Affinity except that this opcode
97636	97813	** forces the register type to the Table column type. This is used
97637	97814	** to implement "strict affinity".
97638	97815	**
		@@ -97643,30 +97820,42 @@
97643	97820	**
97644	97821	** Preconditions:
97645	97822	**
97646	97823	** <ul>
97647	97824	** <li> P2 should be the number of non-virtual columns in the
97648		-** table of P4.
97649		-** <li> Table P4 should be a STRICT table.
	97825	+** table of P4 unless P3>1, in which case P2 will be 1.
	97826	+** <li> Table P4 is a STRICT table.
97650	97827	** </ul>
97651	97828	**
97652	97829	** If any precondition is false, an assertion fault occurs.
97653	97830	*/
97654	97831	case OP_TypeCheck: {
97655	97832	Table *pTab;
97656	97833	Column *aCol;
97657	97834	int i;
	97835	+ int nCol;
97658	97836
97659	97837	assert( pOp->p4type==P4_TABLE );
97660	97838	pTab = pOp->p4.pTab;
97661	97839	assert( pTab->tabFlags & TF_Strict );
97662		- assert( pTab->nNVCol==pOp->p2 );
	97840	+ assert( pOp->p3>=0 && pOp->p3<pTab->nCol+2 );
97663	97841	aCol = pTab->aCol;
97664	97842	pIn1 = &aMem[pOp->p1];
97665		- for(i=0; i<pTab->nCol; i++){
97666		- if( aCol[i].colFlags & COLFLAG_GENERATED ){
97667		- if( aCol[i].colFlags & COLFLAG_VIRTUAL ) continue;
	97843	+ if( pOp->p3<2 ){
	97844	+ assert( pTab->nNVCol==pOp->p2 );
	97845	+ i = 0;
	97846	+ nCol = pTab->nCol;
	97847	+ }else{
	97848	+ i = pOp->p3-2;
	97849	+ nCol = i+1;
	97850	+ assert( i<pTab->nCol );
	97851	+ assert( aCol[i].colFlags & COLFLAG_VIRTUAL );
	97852	+ assert( pOp->p2==1 );
	97853	+ }
	97854	+ for(; i<nCol; i++){
	97855	+ if( (aCol[i].colFlags & COLFLAG_GENERATED)!=0 && pOp->p3<2 ){
	97856	+ if( (aCol[i].colFlags & COLFLAG_VIRTUAL)!=0 ) continue;
97668	97857	if( pOp->p3 ){ pIn1++; continue; }
97669	97858	}
97670	97859	assert( pIn1 < &aMem[pOp->p1+pOp->p2] );
97671	97860	applyAffinity(pIn1, aCol[i].affinity, encoding);
97672	97861	if( (pIn1->flags & MEM_Null)==0 ){
		@@ -98103,10 +98292,11 @@
98103	98292	}
98104	98293	}else{
98105	98294	zHdr += sqlite3PutVarint(zHdr, serial_type);
98106	98295	if( pRec->n ){
98107	98296	assert( pRec->z!=0 );
	98297	+ assert( pRec->z!=(const char*)sqlite3CtypeMap );
98108	98298	memcpy(zPayload, pRec->z, pRec->n);
98109	98299	zPayload += pRec->n;
98110	98300	}
98111	98301	}
98112	98302	if( pRec==pLast ) break;
		@@ -99740,11 +99930,11 @@
99740	99930	rc = ExpandBlob(r.aMem);
99741	99931	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
99742	99932	if( rc ) goto no_mem;
99743	99933	pIdxKey = sqlite3VdbeAllocUnpackedRecord(pC->pKeyInfo);
99744	99934	if( pIdxKey==0 ) goto no_mem;
99745		- sqlite3VdbeRecordUnpack(pC->pKeyInfo, r.aMem->n, r.aMem->z, pIdxKey);
	99935	+ sqlite3VdbeRecordUnpack(r.aMem->n, r.aMem->z, pIdxKey);
99746	99936	pIdxKey->default_rc = 0;
99747	99937	rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, pIdxKey, &pC->seekResult);
99748	99938	sqlite3DbFreeNN(db, pIdxKey);
99749	99939	}
99750	99940	if( rc!=SQLITE_OK ){
		@@ -100737,10 +100927,36 @@
100737	100927	VdbeBranchTaken(res!=0,2);
100738	100928	if( res ) goto jump_to_p2;
100739	100929	}
100740	100930	break;
100741	100931	}
	100932	+
	100933	+/* Opcode: IfEmpty P1 P2 * * *
	100934	+** Synopsis: if( empty(P1) ) goto P2
	100935	+**
	100936	+** Check to see if the b-tree table that cursor P1 references is empty
	100937	+** and jump to P2 if it is.
	100938	+*/
	100939	+case OP_IfEmpty: { /* jump */
	100940	+ VdbeCursor *pC;
	100941	+ BtCursor *pCrsr;
	100942	+ int res;
	100943	+
	100944	+ assert( pOp->p1>=0 && pOp->p1<p->nCursor );
	100945	+ assert( pOp->p2>=0 && pOp->p2<p->nOp );
	100946	+
	100947	+ pC = p->apCsr[pOp->p1];
	100948	+ assert( pC!=0 );
	100949	+ assert( pC->eCurType==CURTYPE_BTREE );
	100950	+ pCrsr = pC->uc.pCursor;
	100951	+ assert( pCrsr );
	100952	+ rc = sqlite3BtreeIsEmpty(pCrsr, &res);
	100953	+ if( rc ) goto abort_due_to_error;
	100954	+ VdbeBranchTaken(res!=0,2);
	100955	+ if( res ) goto jump_to_p2;
	100956	+ break;
	100957	+}
100742	100958
100743	100959	/* Opcode: Next P1 P2 P3 * P5
100744	100960	**
100745	100961	** Advance cursor P1 so that it points to the next key/data pair in its
100746	100962	** table or index. If there are no more key/value pairs then fall through
		@@ -102609,11 +102825,18 @@
102609	102825	sqlite3_vtab_cursor *pVCur;
102610	102826	sqlite3_vtab *pVtab;
102611	102827	const sqlite3_module *pModule;
102612	102828
102613	102829	assert( p->bIsReader );
102614		- pCur = 0;
	102830	+ pCur = p->apCsr[pOp->p1];
	102831	+ if( pCur!=0
	102832	+ && ALWAYS( pCur->eCurType==CURTYPE_VTAB )
	102833	+ && ALWAYS( pCur->uc.pVCur->pVtab==pOp->p4.pVtab->pVtab )
	102834	+ ){
	102835	+ /* This opcode is a no-op if the cursor is already open */
	102836	+ break;
	102837	+ }
102615	102838	pVCur = 0;
102616	102839	pVtab = pOp->p4.pVtab->pVtab;
102617	102840	if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
102618	102841	rc = SQLITE_LOCKED;
102619	102842	goto abort_due_to_error;
		@@ -103551,12 +103774,11 @@
103551	103774	sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc));
103552	103775	}
103553	103776	p->rc = rc;
103554	103777	sqlite3SystemError(db, rc);
103555	103778	testcase( sqlite3GlobalConfig.xLog!=0 );
103556		- sqlite3_log(rc, "statement aborts at %d: [%s] %s",
103557		- (int)(pOp - aOp), p->zSql, p->zErrMsg);
	103779	+ sqlite3VdbeLogAbort(p, rc, pOp, aOp);
103558	103780	if( p->eVdbeState==VDBE_RUN_STATE ) sqlite3VdbeHalt(p);
103559	103781	if( rc==SQLITE_IOERR_NOMEM ) sqlite3OomFault(db);
103560	103782	if( rc==SQLITE_CORRUPT && db->autoCommit==0 ){
103561	103783	db->flags \|= SQLITE_CorruptRdOnly;
103562	103784	}
		@@ -104013,11 +104235,11 @@
104013	104235	void *z,
104014	104236	int n,
104015	104237	int iOffset,
104016	104238	int (xCall)(BtCursor, u32, u32, void*)
104017	104239	){
104018		- int rc;
	104240	+ int rc = SQLITE_OK;
104019	104241	Incrblob p = (Incrblob )pBlob;
104020	104242	Vdbe *v;
104021	104243	sqlite3 *db;
104022	104244
104023	104245	if( p==0 ) return SQLITE_MISUSE_BKPT;
		@@ -104053,21 +104275,36 @@
104053	104275	** same way as an SQLITE_DELETE (the SQLITE_DELETE code is actually
104054	104276	** slightly more efficient). Since you cannot write to a PK column
104055	104277	** using the incremental-blob API, this works. For the sessions module
104056	104278	** anyhow.
104057	104279	*/
104058		- sqlite3_int64 iKey;
104059		- iKey = sqlite3BtreeIntegerKey(p->pCsr);
104060		- assert( v->apCsr[0]!=0 );
104061		- assert( v->apCsr[0]->eCurType==CURTYPE_BTREE );
104062		- sqlite3VdbePreUpdateHook(
104063		- v, v->apCsr[0], SQLITE_DELETE, p->zDb, p->pTab, iKey, -1, p->iCol
104064		- );
104065		- }
104066		-#endif
104067		-
	104280	+ if( sqlite3BtreeCursorIsValidNN(p->pCsr)==0 ){
	104281	+ /* If the cursor is not currently valid, try to reseek it. This
	104282	+ ** always either fails or finds the correct row - the cursor will
	104283	+ ** have been marked permanently CURSOR_INVALID if the open row has
	104284	+ ** been deleted. */
	104285	+ int bDiff = 0;
	104286	+ rc = sqlite3BtreeCursorRestore(p->pCsr, &bDiff);
	104287	+ assert( bDiff==0 \|\| sqlite3BtreeCursorIsValidNN(p->pCsr)==0 );
	104288	+ }
	104289	+ if( sqlite3BtreeCursorIsValidNN(p->pCsr) ){
	104290	+ sqlite3_int64 iKey;
	104291	+ iKey = sqlite3BtreeIntegerKey(p->pCsr);
	104292	+ assert( v->apCsr[0]!=0 );
	104293	+ assert( v->apCsr[0]->eCurType==CURTYPE_BTREE );
	104294	+ sqlite3VdbePreUpdateHook(
	104295	+ v, v->apCsr[0], SQLITE_DELETE, p->zDb, p->pTab, iKey, -1, p->iCol
	104296	+ );
	104297	+ }
	104298	+ }
	104299	+ if( rc==SQLITE_OK ){
	104300	+ rc = xCall(p->pCsr, iOffset+p->iOffset, n, z);
	104301	+ }
	104302	+#else
104068	104303	rc = xCall(p->pCsr, iOffset+p->iOffset, n, z);
	104304	+#endif
	104305	+
104069	104306	sqlite3BtreeLeaveCursor(p->pCsr);
104070	104307	if( rc==SQLITE_ABORT ){
104071	104308	sqlite3VdbeFinalize(v);
104072	104309	p->pStmt = 0;
104073	104310	}else{
		@@ -104916,11 +105153,11 @@
104916	105153	const void pKey1, int nKey1, / Left side of comparison */
104917	105154	const void pKey2, int nKey2 / Right side of comparison */
104918	105155	){
104919	105156	UnpackedRecord *r2 = pTask->pUnpacked;
104920	105157	if( *pbKey2Cached==0 ){
104921		- sqlite3VdbeRecordUnpack(pTask->pSorter->pKeyInfo, nKey2, pKey2, r2);
	105158	+ sqlite3VdbeRecordUnpack(nKey2, pKey2, r2);
104922	105159	*pbKey2Cached = 1;
104923	105160	}
104924	105161	return sqlite3VdbeRecordCompareWithSkip(nKey1, pKey1, r2, 1);
104925	105162	}
104926	105163
		@@ -104943,11 +105180,11 @@
104943	105180	const void pKey1, int nKey1, / Left side of comparison */
104944	105181	const void pKey2, int nKey2 / Right side of comparison */
104945	105182	){
104946	105183	UnpackedRecord *r2 = pTask->pUnpacked;
104947	105184	if( !*pbKey2Cached ){
104948		- sqlite3VdbeRecordUnpack(pTask->pSorter->pKeyInfo, nKey2, pKey2, r2);
	105185	+ sqlite3VdbeRecordUnpack(nKey2, pKey2, r2);
104949	105186	*pbKey2Cached = 1;
104950	105187	}
104951	105188	return sqlite3VdbeRecordCompare(nKey1, pKey1, r2);
104952	105189	}
104953	105190
		@@ -104983,10 +105220,11 @@
104983	105220	res = vdbeSorterCompareTail(
104984	105221	pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
104985	105222	);
104986	105223	}
104987	105224	}else{
	105225	+ assert( pTask->pSorter->pKeyInfo->aSortFlags!=0 );
104988	105226	assert( !(pTask->pSorter->pKeyInfo->aSortFlags[0]&KEYINFO_ORDER_BIGNULL) );
104989	105227	if( pTask->pSorter->pKeyInfo->aSortFlags[0] ){
104990	105228	res = res * -1;
104991	105229	}
104992	105230	}
		@@ -105046,10 +105284,11 @@
105046	105284	}else{
105047	105285	if( *v2 & 0x80 ) res = +1;
105048	105286	}
105049	105287	}
105050	105288
	105289	+ assert( pTask->pSorter->pKeyInfo->aSortFlags!=0 );
105051	105290	if( res==0 ){
105052	105291	if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
105053	105292	res = vdbeSorterCompareTail(
105054	105293	pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
105055	105294	);
		@@ -105119,11 +105358,12 @@
105119	105358	assert( pCsr->pKeyInfo );
105120	105359	assert( !pCsr->isEphemeral );
105121	105360	assert( pCsr->eCurType==CURTYPE_SORTER );
105122	105361	assert( sizeof(KeyInfo) + UMXV(pCsr->pKeyInfo->nKeyField)sizeof(CollSeq)
105123	105362	< 0x7fffffff );
105124		- szKeyInfo = SZ_KEYINFO(pCsr->pKeyInfo->nKeyField+1);
	105363	+ assert( pCsr->pKeyInfo->nKeyField<=pCsr->pKeyInfo->nAllField );
	105364	+ szKeyInfo = SZ_KEYINFO(pCsr->pKeyInfo->nAllField);
105125	105365	sz = SZ_VDBESORTER(nWorker+1);
105126	105366
105127	105367	pSorter = (VdbeSorter*)sqlite3DbMallocZero(db, sz + szKeyInfo);
105128	105368	pCsr->uc.pSorter = pSorter;
105129	105369	if( pSorter==0 ){
		@@ -105133,11 +105373,16 @@
105133	105373	pSorter->pKeyInfo = pKeyInfo = (KeyInfo)((u8)pSorter + sz);
105134	105374	memcpy(pKeyInfo, pCsr->pKeyInfo, szKeyInfo);
105135	105375	pKeyInfo->db = 0;
105136	105376	if( nField && nWorker==0 ){
105137	105377	pKeyInfo->nKeyField = nField;
	105378	+ assert( nField<=pCsr->pKeyInfo->nAllField );
105138	105379	}
	105380	+ /* It is OK that pKeyInfo reuses the aSortFlags field from pCsr->pKeyInfo,
	105381	+ ** since the pCsr->pKeyInfo->aSortFlags[] array is invariant and lives
	105382	+ ** longer that pSorter. */
	105383	+ assert( pKeyInfo->aSortFlags==pCsr->pKeyInfo->aSortFlags );
105139	105384	sqlite3BtreeEnter(pBt);
105140	105385	pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(pBt);
105141	105386	sqlite3BtreeLeave(pBt);
105142	105387	pSorter->nTask = nWorker + 1;
105143	105388	pSorter->iPrev = (u8)(nWorker - 1);
		@@ -106913,11 +107158,11 @@
106913	107158	r2->nField = nKeyCol;
106914	107159	}
106915	107160	assert( r2->nField==nKeyCol );
106916	107161
106917	107162	pKey = vdbeSorterRowkey(pSorter, &nKey);
106918		- sqlite3VdbeRecordUnpack(pKeyInfo, nKey, pKey, r2);
	107163	+ sqlite3VdbeRecordUnpack(nKey, pKey, r2);
106919	107164	for(i=0; i<nKeyCol; i++){
106920	107165	if( r2->aMem[i].flags & MEM_Null ){
106921	107166	*pRes = -1;
106922	107167	return SQLITE_OK;
106923	107168	}
		@@ -109287,17 +109532,16 @@
109287	109532	/* Clearly non-deterministic functions like random(), but also
109288	109533	** date/time functions that use 'now', and other functions like
109289	109534	** sqlite_version() that might change over time cannot be used
109290	109535	** in an index or generated column. Curiously, they can be used
109291	109536	** in a CHECK constraint. SQLServer, MySQL, and PostgreSQL all
109292		- ** all this. */
	109537	+ ** allow this. */
109293	109538	sqlite3ResolveNotValid(pParse, pNC, "non-deterministic functions",
109294	109539	NC_IdxExpr\|NC_PartIdx\|NC_GenCol, 0, pExpr);
109295	109540	}else{
109296	109541	assert( (NC_SelfRef & 0xff)==NC_SelfRef ); /* Must fit in 8 bits */
109297	109542	pExpr->op2 = pNC->ncFlags & NC_SelfRef;
109298		- if( pNC->ncFlags & NC_FromDDL ) ExprSetProperty(pExpr, EP_FromDDL);
109299	109543	}
109300	109544	if( (pDef->funcFlags & SQLITE_FUNC_INTERNAL)!=0
109301	109545	&& pParse->nested==0
109302	109546	&& (pParse->db->mDbFlags & DBFLAG_InternalFunc)==0
109303	109547	){
		@@ -109309,10 +109553,11 @@
109309	109553	pDef = 0;
109310	109554	}else
109311	109555	if( (pDef->funcFlags & (SQLITE_FUNC_DIRECT\|SQLITE_FUNC_UNSAFE))!=0
109312	109556	&& !IN_RENAME_OBJECT
109313	109557	){
	109558	+ if( pNC->ncFlags & NC_FromDDL ) ExprSetProperty(pExpr, EP_FromDDL);
109314	109559	sqlite3ExprFunctionUsable(pParse, pExpr, pDef);
109315	109560	}
109316	109561	}
109317	109562
109318	109563	if( 0==IN_RENAME_OBJECT ){
		@@ -109443,22 +109688,25 @@
109443	109688	** type of the function
109444	109689	*/
109445	109690	return WRC_Prune;
109446	109691	}
109447	109692	#ifndef SQLITE_OMIT_SUBQUERY
	109693	+ case TK_EXISTS:
109448	109694	case TK_SELECT:
109449		- case TK_EXISTS: testcase( pExpr->op==TK_EXISTS );
109450	109695	#endif
109451	109696	case TK_IN: {
109452	109697	testcase( pExpr->op==TK_IN );
	109698	+ testcase( pExpr->op==TK_EXISTS );
	109699	+ testcase( pExpr->op==TK_SELECT );
109453	109700	if( ExprUseXSelect(pExpr) ){
109454	109701	int nRef = pNC->nRef;
109455	109702	testcase( pNC->ncFlags & NC_IsCheck );
109456	109703	testcase( pNC->ncFlags & NC_PartIdx );
109457	109704	testcase( pNC->ncFlags & NC_IdxExpr );
109458	109705	testcase( pNC->ncFlags & NC_GenCol );
109459	109706	assert( pExpr->x.pSelect );
	109707	+ if( pExpr->op==TK_EXISTS ) pParse->bHasExists = 1;
109460	109708	if( pNC->ncFlags & NC_SelfRef ){
109461	109709	notValidImpl(pParse, pNC, "subqueries", pExpr, pExpr);
109462	109710	}else{
109463	109711	sqlite3WalkSelect(pWalker, pExpr->x.pSelect);
109464	109712	}
		@@ -110469,11 +110717,13 @@
110469	110717	assert( pExpr->iTable==pExpr->pLeft->x.pSelect->pEList->nExpr );
110470	110718	return sqlite3ExprAffinity(
110471	110719	pExpr->pLeft->x.pSelect->pEList->a[pExpr->iColumn].pExpr
110472	110720	);
110473	110721	}
110474		- if( op==TK_VECTOR ){
	110722	+ if( op==TK_VECTOR
	110723	+ \|\| (op==TK_FUNCTION && pExpr->affExpr==SQLITE_AFF_DEFER)
	110724	+ ){
110475	110725	assert( ExprUseXList(pExpr) );
110476	110726	return sqlite3ExprAffinity(pExpr->x.pList->a[0].pExpr);
110477	110727	}
110478	110728	if( ExprHasProperty(pExpr, EP_Skip\|EP_IfNullRow) ){
110479	110729	assert( pExpr->op==TK_COLLATE
		@@ -110662,11 +110912,13 @@
110662	110912	}
110663	110913	if( op==TK_CAST \|\| op==TK_UPLUS ){
110664	110914	p = p->pLeft;
110665	110915	continue;
110666	110916	}
110667		- if( op==TK_VECTOR ){
	110917	+ if( op==TK_VECTOR
	110918	+ \|\| (op==TK_FUNCTION && p->affExpr==SQLITE_AFF_DEFER)
	110919	+ ){
110668	110920	assert( ExprUseXList(p) );
110669	110921	p = p->x.pList->a[0].pExpr;
110670	110922	continue;
110671	110923	}
110672	110924	if( op==TK_COLLATE ){
		@@ -111536,11 +111788,11 @@
111536	111788	return pRight;
111537	111789	}else if( pRight==0 ){
111538	111790	return pLeft;
111539	111791	}else{
111540	111792	u32 f = pLeft->flags \| pRight->flags;
111541		- if( (f&(EP_OuterON\|EP_InnerON\|EP_IsFalse))==EP_IsFalse
	111793	+ if( (f&(EP_OuterON\|EP_InnerON\|EP_IsFalse\|EP_HasFunc))==EP_IsFalse
111542	111794	&& !IN_RENAME_OBJECT
111543	111795	){
111544	111796	sqlite3ExprDeferredDelete(pParse, pLeft);
111545	111797	sqlite3ExprDeferredDelete(pParse, pRight);
111546	111798	return sqlite3Expr(db, TK_INTEGER, "0");
		@@ -112764,10 +113016,90 @@
112764	113016	pExpr = pExpr->op==TK_AND ? pLeft : pRight;
112765	113017	}
112766	113018	}
112767	113019	return pExpr;
112768	113020	}
	113021	+
	113022	+/*
	113023	+** Return true if it might be advantageous to compute the right operand
	113024	+** of expression pExpr first, before the left operand.
	113025	+**
	113026	+** Normally the left operand is computed before the right operand. But if
	113027	+** the left operand contains a subquery and the right does not, then it
	113028	+** might be more efficient to compute the right operand first.
	113029	+*/
	113030	+static int exprEvalRhsFirst(Expr *pExpr){
	113031	+ if( ExprHasProperty(pExpr->pLeft, EP_Subquery)
	113032	+ && !ExprHasProperty(pExpr->pRight, EP_Subquery)
	113033	+ ){
	113034	+ return 1;
	113035	+ }else{
	113036	+ return 0;
	113037	+ }
	113038	+}
	113039	+
	113040	+/*
	113041	+** Compute the two operands of a binary operator.
	113042	+**
	113043	+** If either operand contains a subquery, then the code strives to
	113044	+** compute the operand containing the subquery second. If the other
	113045	+** operand evalutes to NULL, then a jump is made. The address of the
	113046	+** IsNull operand that does this jump is returned. The caller can use
	113047	+** this to optimize the computation so as to avoid doing the potentially
	113048	+** expensive subquery.
	113049	+**
	113050	+** If no optimization opportunities exist, return 0.
	113051	+*/
	113052	+static int exprComputeOperands(
	113053	+ Parse pParse, / Parsing context */
	113054	+ Expr pExpr, / The comparison expression */
	113055	+ int pR1, / OUT: Register holding the left operand */
	113056	+ int pR2, / OUT: Register holding the right operand */
	113057	+ int pFree1, / OUT: Temp register to free if not zero */
	113058	+ int pFree2 / OUT: Another temp register to free if not zero */
	113059	+){
	113060	+ int addrIsNull;
	113061	+ int r1, r2;
	113062	+ Vdbe *v = pParse->pVdbe;
	113063	+
	113064	+ assert( v!=0 );
	113065	+ /*
	113066	+ ** If the left operand contains a (possibly expensive) subquery and the
	113067	+ ** right operand does not and the right operation might be NULL,
	113068	+ ** then compute the right operand first and do an IsNull jump if the
	113069	+ ** right operand evalutes to NULL.
	113070	+ */
	113071	+ if( exprEvalRhsFirst(pExpr) && sqlite3ExprCanBeNull(pExpr->pRight) ){
	113072	+ r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, pFree2);
	113073	+ addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r2);
	113074	+ VdbeComment((v, "skip left operand"));
	113075	+ VdbeCoverage(v);
	113076	+ }else{
	113077	+ r2 = 0; /* Silence a false-positive uninit-var warning in MSVC */
	113078	+ addrIsNull = 0;
	113079	+ }
	113080	+ r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, pFree1);
	113081	+ if( addrIsNull==0 ){
	113082	+ /*
	113083	+ ** If the right operand contains a subquery and the left operand does not
	113084	+ ** and the left operand might be NULL, then check the left operand do
	113085	+ ** an IsNull check on the left operand before computing the right
	113086	+ ** operand.
	113087	+ */
	113088	+ if( ExprHasProperty(pExpr->pRight, EP_Subquery)
	113089	+ && sqlite3ExprCanBeNull(pExpr->pLeft)
	113090	+ ){
	113091	+ addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r1);
	113092	+ VdbeComment((v, "skip right operand"));
	113093	+ VdbeCoverage(v);
	113094	+ }
	113095	+ r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, pFree2);
	113096	+ }
	113097	+ *pR1 = r1;
	113098	+ *pR2 = r2;
	113099	+ return addrIsNull;
	113100	+}
112769	113101
112770	113102	/*
112771	113103	** pExpr is a TK_FUNCTION node. Try to determine whether or not the
112772	113104	** function is a constant function. A function is constant if all of
112773	113105	** the following are true:
		@@ -114022,15 +114354,16 @@
114022	114354	pCopy = sqlite3SelectDup(pParse->db, pSelect, 0);
114023	114355	rc = pParse->db->mallocFailed ? 1 :sqlite3Select(pParse, pCopy, &dest);
114024	114356	sqlite3SelectDelete(pParse->db, pCopy);
114025	114357	sqlite3DbFree(pParse->db, dest.zAffSdst);
114026	114358	if( addrBloom ){
	114359	+ /* Remember that location of the Bloom filter in the P3 operand
	114360	+ ** of the OP_Once that began this subroutine. tag-202407032019 */
114027	114361	sqlite3VdbeGetOp(v, addrOnce)->p3 = dest.iSDParm2;
114028	114362	if( dest.iSDParm2==0 ){
114029		- sqlite3VdbeChangeToNoop(v, addrBloom);
114030		- }else{
114031		- sqlite3VdbeGetOp(v, addrOnce)->p3 = dest.iSDParm2;
	114363	+ /* If the Bloom filter won't actually be used, keep it small */
	114364	+ sqlite3VdbeGetOp(v, addrBloom)->p1 = 10;
114032	114365	}
114033	114366	}
114034	114367	if( rc ){
114035	114368	sqlite3KeyInfoUnref(pKeyInfo);
114036	114369	return;
		@@ -114208,21 +114541,27 @@
114208	114541	dest.eDest = SRT_Exists;
114209	114542	sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iSDParm);
114210	114543	VdbeComment((v, "Init EXISTS result"));
114211	114544	}
114212	114545	if( pSel->pLimit ){
114213		- /* The subquery already has a limit. If the pre-existing limit is X
114214		- ** then make the new limit X<>0 so that the new limit is either 1 or 0 */
114215		- sqlite3 *db = pParse->db;
114216		- pLimit = sqlite3Expr(db, TK_INTEGER, "0");
114217		- if( pLimit ){
114218		- pLimit->affExpr = SQLITE_AFF_NUMERIC;
114219		- pLimit = sqlite3PExpr(pParse, TK_NE,
114220		- sqlite3ExprDup(db, pSel->pLimit->pLeft, 0), pLimit);
114221		- }
114222		- sqlite3ExprDeferredDelete(pParse, pSel->pLimit->pLeft);
114223		- pSel->pLimit->pLeft = pLimit;
	114546	+ /* The subquery already has a limit. If the pre-existing limit X is
	114547	+ ** not already integer value 1 or 0, then make the new limit X<>0 so that
	114548	+ ** the new limit is either 1 or 0 */
	114549	+ Expr *pLeft = pSel->pLimit->pLeft;
	114550	+ if( ExprHasProperty(pLeft, EP_IntValue)==0
	114551	+ \|\| (pLeft->u.iValue!=1 && pLeft->u.iValue!=0)
	114552	+ ){
	114553	+ sqlite3 *db = pParse->db;
	114554	+ pLimit = sqlite3Expr(db, TK_INTEGER, "0");
	114555	+ if( pLimit ){
	114556	+ pLimit->affExpr = SQLITE_AFF_NUMERIC;
	114557	+ pLimit = sqlite3PExpr(pParse, TK_NE,
	114558	+ sqlite3ExprDup(db, pLeft, 0), pLimit);
	114559	+ }
	114560	+ sqlite3ExprDeferredDelete(pParse, pLeft);
	114561	+ pSel->pLimit->pLeft = pLimit;
	114562	+ }
114224	114563	}else{
114225	114564	/* If there is no pre-existing limit add a limit of 1 */
114226	114565	pLimit = sqlite3Expr(pParse->db, TK_INTEGER, "1");
114227	114566	pSel->pLimit = sqlite3PExpr(pParse, TK_LIMIT, pLimit, 0);
114228	114567	}
		@@ -114473,11 +114812,11 @@
114473	114812	if( destIfFalse==destIfNull ){
114474	114813	/* Combine Step 3 and Step 5 into a single opcode */
114475	114814	if( ExprHasProperty(pExpr, EP_Subrtn) ){
114476	114815	const VdbeOp *pOp = sqlite3VdbeGetOp(v, pExpr->y.sub.iAddr);
114477	114816	assert( pOp->opcode==OP_Once \|\| pParse->nErr );
114478		- if( pOp->opcode==OP_Once && pOp->p3>0 ){
	114817	+ if( pOp->opcode==OP_Once && pOp->p3>0 ){ /* tag-202407032019 */
114479	114818	assert( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) );
114480	114819	sqlite3VdbeAddOp4Int(v, OP_Filter, pOp->p3, destIfFalse,
114481	114820	rLhs, nVector); VdbeCoverage(v);
114482	114821	}
114483	114822	}
		@@ -114660,11 +114999,16 @@
114660	114999	iAddr = sqlite3VdbeAddOp3(v, OP_IfNullRow, pParse->iSelfTab-1, 0, regOut);
114661	115000	}else{
114662	115001	iAddr = 0;
114663	115002	}
114664	115003	sqlite3ExprCodeCopy(pParse, sqlite3ColumnExpr(pTab,pCol), regOut);
114665		- if( pCol->affinity>=SQLITE_AFF_TEXT ){
	115004	+ if( (pCol->colFlags & COLFLAG_VIRTUAL)!=0
	115005	+ && (pTab->tabFlags & TF_Strict)!=0
	115006	+ ){
	115007	+ int p3 = 2+(int)(pCol - pTab->aCol);
	115008	+ sqlite3VdbeAddOp4(v, OP_TypeCheck, regOut, 1, p3, (char*)pTab, P4_TABLE);
	115009	+ }else if( pCol->affinity>=SQLITE_AFF_TEXT ){
114666	115010	sqlite3VdbeAddOp4(v, OP_Affinity, regOut, 1, 0, &pCol->affinity, 1);
114667	115011	}
114668	115012	if( iAddr ) sqlite3VdbeJumpHere(v, iAddr);
114669	115013	if( pParse->nErr>nErr ) pParse->db->errByteOffset = -1;
114670	115014	}
		@@ -115347,15 +115691,21 @@
115347	115691	case TK_GT:
115348	115692	case TK_GE:
115349	115693	case TK_NE:
115350	115694	case TK_EQ: {
115351	115695	Expr *pLeft = pExpr->pLeft;
	115696	+ int addrIsNull = 0;
115352	115697	if( sqlite3ExprIsVector(pLeft) ){
115353	115698	codeVectorCompare(pParse, pExpr, target, op, p5);
115354	115699	}else{
115355		- r1 = sqlite3ExprCodeTemp(pParse, pLeft, &regFree1);
115356		- r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	115700	+ if( ExprHasProperty(pExpr, EP_Subquery) && p5!=SQLITE_NULLEQ ){
	115701	+ addrIsNull = exprComputeOperands(pParse, pExpr,
	115702	+ &r1, &r2, &regFree1, &regFree2);
	115703	+ }else{
	115704	+ r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
	115705	+ r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	115706	+ }
115357	115707	sqlite3VdbeAddOp2(v, OP_Integer, 1, inReg);
115358	115708	codeCompare(pParse, pLeft, pExpr->pRight, op, r1, r2,
115359	115709	sqlite3VdbeCurrentAddr(v)+2, p5,
115360	115710	ExprHasProperty(pExpr,EP_Commuted));
115361	115711	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
		@@ -115366,13 +115716,19 @@
115366	115716	assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
115367	115717	if( p5==SQLITE_NULLEQ ){
115368	115718	sqlite3VdbeAddOp2(v, OP_Integer, 0, inReg);
115369	115719	}else{
115370	115720	sqlite3VdbeAddOp3(v, OP_ZeroOrNull, r1, inReg, r2);
	115721	+ if( addrIsNull ){
	115722	+ sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
	115723	+ sqlite3VdbeJumpHere(v, addrIsNull);
	115724	+ sqlite3VdbeAddOp2(v, OP_Null, 0, inReg);
	115725	+ }
115371	115726	}
115372	115727	testcase( regFree1==0 );
115373	115728	testcase( regFree2==0 );
	115729	+
115374	115730	}
115375	115731	break;
115376	115732	}
115377	115733	case TK_AND:
115378	115734	case TK_OR:
		@@ -115384,10 +115740,11 @@
115384	115740	case TK_BITOR:
115385	115741	case TK_SLASH:
115386	115742	case TK_LSHIFT:
115387	115743	case TK_RSHIFT:
115388	115744	case TK_CONCAT: {
	115745	+ int addrIsNull;
115389	115746	assert( TK_AND==OP_And ); testcase( op==TK_AND );
115390	115747	assert( TK_OR==OP_Or ); testcase( op==TK_OR );
115391	115748	assert( TK_PLUS==OP_Add ); testcase( op==TK_PLUS );
115392	115749	assert( TK_MINUS==OP_Subtract ); testcase( op==TK_MINUS );
115393	115750	assert( TK_REM==OP_Remainder ); testcase( op==TK_REM );
		@@ -115395,15 +115752,27 @@
115395	115752	assert( TK_BITOR==OP_BitOr ); testcase( op==TK_BITOR );
115396	115753	assert( TK_SLASH==OP_Divide ); testcase( op==TK_SLASH );
115397	115754	assert( TK_LSHIFT==OP_ShiftLeft ); testcase( op==TK_LSHIFT );
115398	115755	assert( TK_RSHIFT==OP_ShiftRight ); testcase( op==TK_RSHIFT );
115399	115756	assert( TK_CONCAT==OP_Concat ); testcase( op==TK_CONCAT );
115400		- r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
115401		- r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	115757	+ if( ExprHasProperty(pExpr, EP_Subquery) ){
	115758	+ addrIsNull = exprComputeOperands(pParse, pExpr,
	115759	+ &r1, &r2, &regFree1, &regFree2);
	115760	+ }else{
	115761	+ r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
	115762	+ r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	115763	+ addrIsNull = 0;
	115764	+ }
115402	115765	sqlite3VdbeAddOp3(v, op, r2, r1, target);
115403	115766	testcase( regFree1==0 );
115404	115767	testcase( regFree2==0 );
	115768	+ if( addrIsNull ){
	115769	+ sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
	115770	+ sqlite3VdbeJumpHere(v, addrIsNull);
	115771	+ sqlite3VdbeAddOp2(v, OP_Null, 0, target);
	115772	+ VdbeComment((v, "short-circut value"));
	115773	+ }
115405	115774	break;
115406	115775	}
115407	115776	case TK_UMINUS: {
115408	115777	Expr *pLeft = pExpr->pLeft;
115409	115778	assert( pLeft );
		@@ -116248,21 +116617,31 @@
116248	116617	case TK_AND:
116249	116618	case TK_OR: {
116250	116619	Expr *pAlt = sqlite3ExprSimplifiedAndOr(pExpr);
116251	116620	if( pAlt!=pExpr ){
116252	116621	sqlite3ExprIfTrue(pParse, pAlt, dest, jumpIfNull);
116253		- }else if( op==TK_AND ){
116254		- int d2 = sqlite3VdbeMakeLabel(pParse);
116255		- testcase( jumpIfNull==0 );
116256		- sqlite3ExprIfFalse(pParse, pExpr->pLeft, d2,
116257		- jumpIfNull^SQLITE_JUMPIFNULL);
116258		- sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
116259		- sqlite3VdbeResolveLabel(v, d2);
116260	116622	}else{
116261		- testcase( jumpIfNull==0 );
116262		- sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
116263		- sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
	116623	+ Expr pFirst, pSecond;
	116624	+ if( exprEvalRhsFirst(pExpr) ){
	116625	+ pFirst = pExpr->pRight;
	116626	+ pSecond = pExpr->pLeft;
	116627	+ }else{
	116628	+ pFirst = pExpr->pLeft;
	116629	+ pSecond = pExpr->pRight;
	116630	+ }
	116631	+ if( op==TK_AND ){
	116632	+ int d2 = sqlite3VdbeMakeLabel(pParse);
	116633	+ testcase( jumpIfNull==0 );
	116634	+ sqlite3ExprIfFalse(pParse, pFirst, d2,
	116635	+ jumpIfNull^SQLITE_JUMPIFNULL);
	116636	+ sqlite3ExprIfTrue(pParse, pSecond, dest, jumpIfNull);
	116637	+ sqlite3VdbeResolveLabel(v, d2);
	116638	+ }else{
	116639	+ testcase( jumpIfNull==0 );
	116640	+ sqlite3ExprIfTrue(pParse, pFirst, dest, jumpIfNull);
	116641	+ sqlite3ExprIfTrue(pParse, pSecond, dest, jumpIfNull);
	116642	+ }
116264	116643	}
116265	116644	break;
116266	116645	}
116267	116646	case TK_NOT: {
116268	116647	testcase( jumpIfNull==0 );
		@@ -116297,14 +116676,20 @@
116297	116676	case TK_LE:
116298	116677	case TK_GT:
116299	116678	case TK_GE:
116300	116679	case TK_NE:
116301	116680	case TK_EQ: {
	116681	+ int addrIsNull;
116302	116682	if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
116303		- testcase( jumpIfNull==0 );
116304		- r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116305		- r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	116683	+ if( ExprHasProperty(pExpr, EP_Subquery) && jumpIfNull!=SQLITE_NULLEQ ){
	116684	+ addrIsNull = exprComputeOperands(pParse, pExpr,
	116685	+ &r1, &r2, &regFree1, &regFree2);
	116686	+ }else{
	116687	+ r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
	116688	+ r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	116689	+ addrIsNull = 0;
	116690	+ }
116306	116691	codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
116307	116692	r1, r2, dest, jumpIfNull, ExprHasProperty(pExpr,EP_Commuted));
116308	116693	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
116309	116694	assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
116310	116695	assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
		@@ -116315,22 +116700,29 @@
116315	116700	assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
116316	116701	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
116317	116702	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
116318	116703	testcase( regFree1==0 );
116319	116704	testcase( regFree2==0 );
	116705	+ if( addrIsNull ){
	116706	+ if( jumpIfNull ){
	116707	+ sqlite3VdbeChangeP2(v, addrIsNull, dest);
	116708	+ }else{
	116709	+ sqlite3VdbeJumpHere(v, addrIsNull);
	116710	+ }
	116711	+ }
116320	116712	break;
116321	116713	}
116322	116714	case TK_ISNULL:
116323	116715	case TK_NOTNULL: {
116324	116716	assert( TK_ISNULL==OP_IsNull ); testcase( op==TK_ISNULL );
116325	116717	assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
116326	116718	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116327		- sqlite3VdbeTypeofColumn(v, r1);
	116719	+ assert( regFree1==0 \|\| regFree1==r1 );
	116720	+ if( regFree1 ) sqlite3VdbeTypeofColumn(v, r1);
116328	116721	sqlite3VdbeAddOp2(v, op, r1, dest);
116329	116722	VdbeCoverageIf(v, op==TK_ISNULL);
116330	116723	VdbeCoverageIf(v, op==TK_NOTNULL);
116331		- testcase( regFree1==0 );
116332	116724	break;
116333	116725	}
116334	116726	case TK_BETWEEN: {
116335	116727	testcase( jumpIfNull==0 );
116336	116728	exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfTrue, jumpIfNull);
		@@ -116422,21 +116814,31 @@
116422	116814	case TK_AND:
116423	116815	case TK_OR: {
116424	116816	Expr *pAlt = sqlite3ExprSimplifiedAndOr(pExpr);
116425	116817	if( pAlt!=pExpr ){
116426	116818	sqlite3ExprIfFalse(pParse, pAlt, dest, jumpIfNull);
116427		- }else if( pExpr->op==TK_AND ){
116428		- testcase( jumpIfNull==0 );
116429		- sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
116430		- sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
116431	116819	}else{
116432		- int d2 = sqlite3VdbeMakeLabel(pParse);
116433		- testcase( jumpIfNull==0 );
116434		- sqlite3ExprIfTrue(pParse, pExpr->pLeft, d2,
116435		- jumpIfNull^SQLITE_JUMPIFNULL);
116436		- sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
116437		- sqlite3VdbeResolveLabel(v, d2);
	116820	+ Expr pFirst, pSecond;
	116821	+ if( exprEvalRhsFirst(pExpr) ){
	116822	+ pFirst = pExpr->pRight;
	116823	+ pSecond = pExpr->pLeft;
	116824	+ }else{
	116825	+ pFirst = pExpr->pLeft;
	116826	+ pSecond = pExpr->pRight;
	116827	+ }
	116828	+ if( pExpr->op==TK_AND ){
	116829	+ testcase( jumpIfNull==0 );
	116830	+ sqlite3ExprIfFalse(pParse, pFirst, dest, jumpIfNull);
	116831	+ sqlite3ExprIfFalse(pParse, pSecond, dest, jumpIfNull);
	116832	+ }else{
	116833	+ int d2 = sqlite3VdbeMakeLabel(pParse);
	116834	+ testcase( jumpIfNull==0 );
	116835	+ sqlite3ExprIfTrue(pParse, pFirst, d2,
	116836	+ jumpIfNull^SQLITE_JUMPIFNULL);
	116837	+ sqlite3ExprIfFalse(pParse, pSecond, dest, jumpIfNull);
	116838	+ sqlite3VdbeResolveLabel(v, d2);
	116839	+ }
116438	116840	}
116439	116841	break;
116440	116842	}
116441	116843	case TK_NOT: {
116442	116844	testcase( jumpIfNull==0 );
		@@ -116474,14 +116876,20 @@
116474	116876	case TK_LE:
116475	116877	case TK_GT:
116476	116878	case TK_GE:
116477	116879	case TK_NE:
116478	116880	case TK_EQ: {
	116881	+ int addrIsNull;
116479	116882	if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
116480		- testcase( jumpIfNull==0 );
116481		- r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116482		- r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	116883	+ if( ExprHasProperty(pExpr, EP_Subquery) && jumpIfNull!=SQLITE_NULLEQ ){
	116884	+ addrIsNull = exprComputeOperands(pParse, pExpr,
	116885	+ &r1, &r2, &regFree1, &regFree2);
	116886	+ }else{
	116887	+ r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
	116888	+ r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
	116889	+ addrIsNull = 0;
	116890	+ }
116483	116891	codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
116484	116892	r1, r2, dest, jumpIfNull,ExprHasProperty(pExpr,EP_Commuted));
116485	116893	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
116486	116894	assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
116487	116895	assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
		@@ -116492,20 +116900,27 @@
116492	116900	assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
116493	116901	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
116494	116902	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
116495	116903	testcase( regFree1==0 );
116496	116904	testcase( regFree2==0 );
	116905	+ if( addrIsNull ){
	116906	+ if( jumpIfNull ){
	116907	+ sqlite3VdbeChangeP2(v, addrIsNull, dest);
	116908	+ }else{
	116909	+ sqlite3VdbeJumpHere(v, addrIsNull);
	116910	+ }
	116911	+ }
116497	116912	break;
116498	116913	}
116499	116914	case TK_ISNULL:
116500	116915	case TK_NOTNULL: {
116501	116916	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116502		- sqlite3VdbeTypeofColumn(v, r1);
	116917	+ assert( regFree1==0 \|\| regFree1==r1 );
	116918	+ if( regFree1 ) sqlite3VdbeTypeofColumn(v, r1);
116503	116919	sqlite3VdbeAddOp2(v, op, r1, dest);
116504	116920	testcase( op==TK_ISNULL ); VdbeCoverageIf(v, op==TK_ISNULL);
116505	116921	testcase( op==TK_NOTNULL ); VdbeCoverageIf(v, op==TK_NOTNULL);
116506		- testcase( regFree1==0 );
116507	116922	break;
116508	116923	}
116509	116924	case TK_BETWEEN: {
116510	116925	testcase( jumpIfNull==0 );
116511	116926	exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfFalse, jumpIfNull);
		@@ -117401,11 +117816,13 @@
117401	117816	AggInfo pAggInfo, / The AggInfo object to search and/or modify */
117402	117817	Expr pExpr / Expr describing the column to find or insert */
117403	117818	){
117404	117819	struct AggInfo_col *pCol;
117405	117820	int k;
	117821	+ int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
117406	117822
	117823	+ assert( mxTerm <= SMXV(i16) );
117407	117824	assert( pAggInfo->iFirstReg==0 );
117408	117825	pCol = pAggInfo->aCol;
117409	117826	for(k=0; k<pAggInfo->nColumn; k++, pCol++){
117410	117827	if( pCol->pCExpr==pExpr ) return;
117411	117828	if( pCol->iTable==pExpr->iTable
		@@ -117418,10 +117835,14 @@
117418	117835	k = addAggInfoColumn(pParse->db, pAggInfo);
117419	117836	if( k<0 ){
117420	117837	/* OOM on resize */
117421	117838	assert( pParse->db->mallocFailed );
117422	117839	return;
	117840	+ }
	117841	+ if( k>mxTerm ){
	117842	+ sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
	117843	+ k = mxTerm;
117423	117844	}
117424	117845	pCol = &pAggInfo->aCol[k];
117425	117846	assert( ExprUseYTab(pExpr) );
117426	117847	pCol->pTab = pExpr->y.pTab;
117427	117848	pCol->iTable = pExpr->iTable;
		@@ -117452,10 +117873,11 @@
117452	117873	assert( pExpr->pAggInfo==0 \|\| pExpr->pAggInfo==pAggInfo );
117453	117874	pExpr->pAggInfo = pAggInfo;
117454	117875	if( pExpr->op==TK_COLUMN ){
117455	117876	pExpr->op = TK_AGG_COLUMN;
117456	117877	}
	117878	+ assert( k <= SMXV(pExpr->iAgg) );
117457	117879	pExpr->iAgg = (i16)k;
117458	117880	}
117459	117881
117460	117882	/*
117461	117883	** This is the xExprCallback for a tree walker. It is used to
		@@ -117536,17 +117958,23 @@
117536	117958	){
117537	117959	/* Check to see if pExpr is a duplicate of another aggregate
117538	117960	** function that is already in the pAggInfo structure
117539	117961	*/
117540	117962	struct AggInfo_func *pItem = pAggInfo->aFunc;
	117963	+ int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
	117964	+ assert( mxTerm <= SMXV(i16) );
117541	117965	for(i=0; i<pAggInfo->nFunc; i++, pItem++){
117542	117966	if( NEVER(pItem->pFExpr==pExpr) ) break;
117543	117967	if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
117544	117968	break;
117545	117969	}
117546	117970	}
117547		- if( i>=pAggInfo->nFunc ){
	117971	+ if( i>mxTerm ){
	117972	+ sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
	117973	+ i = mxTerm;
	117974	+ assert( i<pAggInfo->nFunc );
	117975	+ }else if( i>=pAggInfo->nFunc ){
117548	117976	/* pExpr is original. Make a new entry in pAggInfo->aFunc[]
117549	117977	*/
117550	117978	u8 enc = ENC(pParse->db);
117551	117979	i = addAggInfoFunc(pParse->db, pAggInfo);
117552	117980	if( i>=0 ){
		@@ -117596,10 +118024,11 @@
117596	118024	}
117597	118025	/* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
117598	118026	*/
117599	118027	assert( !ExprHasProperty(pExpr, EP_TokenOnly\|EP_Reduced) );
117600	118028	ExprSetVVAProperty(pExpr, EP_NoReduce);
	118029	+ assert( i <= SMXV(pExpr->iAgg) );
117601	118030	pExpr->iAgg = (i16)i;
117602	118031	pExpr->pAggInfo = pAggInfo;
117603	118032	return WRC_Prune;
117604	118033	}else{
117605	118034	return WRC_Continue;
		@@ -118998,14 +119427,14 @@
118998	119427	}else{
118999	119428	nQuot = sqlite3Strlen30(zQuot)-1;
119000	119429	}
119001	119430
119002	119431	assert( nQuot>=nNew && nSql>=0 && nNew>=0 );
119003		- zOut = sqlite3DbMallocZero(db, (u64)(nSql + pRename->nList*nQuot + 1));
	119432	+ zOut = sqlite3DbMallocZero(db, (u64)nSql + pRename->nList*(u64)nQuot + 1);
119004	119433	}else{
119005	119434	assert( nSql>0 );
119006		- zOut = (char)sqlite3DbMallocZero(db, (u64)(nSql2+1) * 3);
	119435	+ zOut = (char)sqlite3DbMallocZero(db, (2(u64)nSql + 1) * 3);
119007	119436	if( zOut ){
119008	119437	zBuf1 = &zOut[nSql*2+1];
119009	119438	zBuf2 = &zOut[nSql*4+2];
119010	119439	}
119011	119440	}
		@@ -121683,20 +122112,10 @@
121683	122112	}
121684	122113	#endif
121685	122114	while( z[0]!=0 && z[0]!=' ' ) z++;
121686	122115	while( z[0]==' ' ) z++;
121687	122116	}
121688		-
121689		- /* Set the bLowQual flag if the peak number of rows obtained
121690		- ** from a full equality match is so large that a full table scan
121691		- ** seems likely to be faster than using the index.
121692		- */
121693		- if( aLog[0] > 66 /* Index has more than 100 rows */
121694		- && aLog[0] <= aLog[nOut-1] /* And only a single value seen */
121695		- ){
121696		- pIndex->bLowQual = 1;
121697		- }
121698	122117	}
121699	122118	}
121700	122119
121701	122120	/*
121702	122121	** This callback is invoked once for each index when reading the
		@@ -124091,11 +124510,11 @@
124091	124510	*/
124092	124511	SQLITE_PRIVATE int sqlite3TableColumnToIndex(Index *pIdx, int iCol){
124093	124512	int i;
124094	124513	i16 iCol16;
124095	124514	assert( iCol>=(-1) && iCol<=SQLITE_MAX_COLUMN );
124096		- assert( pIdx->nColumn<=SQLITE_MAX_COLUMN );
	124515	+ assert( pIdx->nColumn<=SQLITE_MAX_COLUMN+1 );
124097	124516	iCol16 = iCol;
124098	124517	for(i=0; i<pIdx->nColumn; i++){
124099	124518	if( iCol16==pIdx->aiColumn[i] ){
124100	124519	return i;
124101	124520	}
		@@ -127239,11 +127658,10 @@
127239	127658	}else{
127240	127659	j = pCExpr->iColumn;
127241	127660	assert( j<=0x7fff );
127242	127661	if( j<0 ){
127243	127662	j = pTab->iPKey;
127244		- pIndex->bIdxRowid = 1;
127245	127663	}else{
127246	127664	if( pTab->aCol[j].notNull==0 ){
127247	127665	pIndex->uniqNotNull = 0;
127248	127666	}
127249	127667	if( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ){
		@@ -128158,20 +128576,26 @@
128158	128576	** Append the contents of SrcList p2 to SrcList p1 and return the resulting
128159	128577	** SrcList. Or, if an error occurs, return NULL. In all cases, p1 and p2
128160	128578	** are deleted by this function.
128161	128579	*/
128162	128580	SQLITE_PRIVATE SrcList sqlite3SrcListAppendList(Parse pParse, SrcList p1, SrcList p2){
128163		- assert( p1 && p1->nSrc==1 );
	128581	+ assert( p1 );
	128582	+ assert( p2 \|\| pParse->nErr );
	128583	+ assert( p2==0 \|\| p2->nSrc>=1 );
	128584	+ testcase( p1->nSrc==0 );
128164	128585	if( p2 ){
128165		- SrcList *pNew = sqlite3SrcListEnlarge(pParse, p1, p2->nSrc, 1);
	128586	+ int nOld = p1->nSrc;
	128587	+ SrcList *pNew = sqlite3SrcListEnlarge(pParse, p1, p2->nSrc, nOld);
128166	128588	if( pNew==0 ){
128167	128589	sqlite3SrcListDelete(pParse->db, p2);
128168	128590	}else{
128169	128591	p1 = pNew;
128170		- memcpy(&p1->a[1], p2->a, p2->nSrc*sizeof(SrcItem));
	128592	+ memcpy(&p1->a[nOld], p2->a, p2->nSrc*sizeof(SrcItem));
	128593	+ assert( nOld==1 \|\| (p2->a[0].fg.jointype & JT_LTORJ)==0 );
	128594	+ assert( p1->nSrc>=1 );
	128595	+ p1->a[0].fg.jointype \|= (JT_LTORJ & p2->a[0].fg.jointype);
128171	128596	sqlite3DbFree(pParse->db, p2);
128172		- p1->a[0].fg.jointype \|= (JT_LTORJ & p1->a[1].fg.jointype);
128173	128597	}
128174	128598	}
128175	128599	return p1;
128176	128600	}
128177	128601
		@@ -132064,11 +132488,11 @@
132064	132488	int argc,
132065	132489	sqlite3_value **argv,
132066	132490	int nSep,
132067	132491	const char *zSep
132068	132492	){
132069		- i64 j, k, n = 0;
	132493	+ i64 j, n = 0;
132070	132494	int i;
132071	132495	char *z;
132072	132496	for(i=0; i<argc; i++){
132073	132497	n += sqlite3_value_bytes(argv[i]);
132074	132498	}
		@@ -132078,12 +132502,12 @@
132078	132502	sqlite3_result_error_nomem(context);
132079	132503	return;
132080	132504	}
132081	132505	j = 0;
132082	132506	for(i=0; i<argc; i++){
132083		- k = sqlite3_value_bytes(argv[i]);
132084		- if( k>0 ){
	132507	+ if( sqlite3_value_type(argv[i])!=SQLITE_NULL ){
	132508	+ int k = sqlite3_value_bytes(argv[i]);
132085	132509	const char v = (const char)sqlite3_value_text(argv[i]);
132086	132510	if( v!=0 ){
132087	132511	if( j>0 && nSep>0 ){
132088	132512	memcpy(&z[j], zSep, nSep);
132089	132513	j += nSep;
		@@ -135017,16 +135441,19 @@
135017	135441	if( iReg==0 ){
135018	135442	/* Move the previous opcode (which should be OP_MakeRecord) forward
135019	135443	** by one slot and insert a new OP_TypeCheck where the current
135020	135444	** OP_MakeRecord is found */
135021	135445	VdbeOp *pPrev;
	135446	+ int p3;
135022	135447	sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
135023	135448	pPrev = sqlite3VdbeGetLastOp(v);
135024	135449	assert( pPrev!=0 );
135025	135450	assert( pPrev->opcode==OP_MakeRecord \|\| sqlite3VdbeDb(v)->mallocFailed );
135026	135451	pPrev->opcode = OP_TypeCheck;
135027		- sqlite3VdbeAddOp3(v, OP_MakeRecord, pPrev->p1, pPrev->p2, pPrev->p3);
	135452	+ p3 = pPrev->p3;
	135453	+ pPrev->p3 = 0;
	135454	+ sqlite3VdbeAddOp3(v, OP_MakeRecord, pPrev->p1, pPrev->p2, p3);
135028	135455	}else{
135029	135456	/* Insert an isolated OP_Typecheck */
135030	135457	sqlite3VdbeAddOp2(v, OP_TypeCheck, iReg, pTab->nNVCol);
135031	135458	sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
135032	135459	}
		@@ -138755,10 +139182,12 @@
138755	139182	/* Version 3.43.0 and later */
138756	139183	int (stmt_explain)(sqlite3_stmt,int);
138757	139184	/* Version 3.44.0 and later */
138758	139185	void (get_clientdata)(sqlite3,const char);
138759	139186	int (set_clientdata)(sqlite3, const char, void, void()(void));
	139187	+ /* Version 3.50.0 and later */
	139188	+ int (setlk_timeout)(sqlite3,int,int);
138760	139189	};
138761	139190
138762	139191	/*
138763	139192	** This is the function signature used for all extension entry points. It
138764	139193	** is also defined in the file "loadext.c".
		@@ -139088,10 +139517,12 @@
139088	139517	/* Version 3.43.0 and later */
139089	139518	#define sqlite3_stmt_explain sqlite3_api->stmt_explain
139090	139519	/* Version 3.44.0 and later */
139091	139520	#define sqlite3_get_clientdata sqlite3_api->get_clientdata
139092	139521	#define sqlite3_set_clientdata sqlite3_api->set_clientdata
	139522	+/* Version 3.50.0 and later */
	139523	+#define sqlite3_setlk_timeout sqlite3_api->setlk_timeout
139093	139524	#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
139094	139525
139095	139526	#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
139096	139527	/* This case when the file really is being compiled as a loadable
139097	139528	** extension */
		@@ -139609,11 +140040,13 @@
139609	140040	sqlite3_is_interrupted,
139610	140041	/* Version 3.43.0 and later */
139611	140042	sqlite3_stmt_explain,
139612	140043	/* Version 3.44.0 and later */
139613	140044	sqlite3_get_clientdata,
139614		- sqlite3_set_clientdata
	140045	+ sqlite3_set_clientdata,
	140046	+ /* Version 3.50.0 and later */
	140047	+ sqlite3_setlk_timeout
139615	140048	};
139616	140049
139617	140050	/* True if x is the directory separator character
139618	140051	*/
139619	140052	#if SQLITE_OS_WIN
		@@ -145235,11 +145668,11 @@
145235	145668	SrcList pSrc, / Array of tables to search */
145236	145669	int iStart, /* First member of pSrc->a[] to check */
145237	145670	int iEnd, /* Last member of pSrc->a[] to check */
145238	145671	const char zCol, / Name of the column we are looking for */
145239	145672	int piTab, / Write index of pSrc->a[] here */
145240		- int piCol, / Write index of pSrc->a[piTab].pTab->aCol[] here /
	145673	+ int piCol, / Write index of pSrc->a[piTab].pSTab->aCol[] here /
145241	145674	int bIgnoreHidden /* Ignore hidden columns */
145242	145675	){
145243	145676	int i; /* For looping over tables in pSrc */
145244	145677	int iCol; /* Index of column matching zCol */
145245	145678
		@@ -145447,11 +145880,11 @@
145447	145880	"not present in both tables", zName);
145448	145881	return 1;
145449	145882	}
145450	145883	pE1 = sqlite3CreateColumnExpr(db, pSrc, iLeft, iLeftCol);
145451	145884	sqlite3SrcItemColumnUsed(&pSrc->a[iLeft], iLeftCol);
145452		- if( (pSrc->a[0].fg.jointype & JT_LTORJ)!=0 ){
	145885	+ if( (pSrc->a[0].fg.jointype & JT_LTORJ)!=0 && pParse->nErr==0 ){
145453	145886	/* This branch runs if the query contains one or more RIGHT or FULL
145454	145887	** JOINs. If only a single table on the left side of this join
145455	145888	** contains the zName column, then this branch is a no-op.
145456	145889	** But if there are two or more tables on the left side
145457	145890	** of the join, construct a coalesce() function that gathers all
		@@ -145463,10 +145896,12 @@
145463	145896	** JOIN. But older versions of SQLite do not do that, so we avoid
145464	145897	** adding a new error so as to not break legacy applications.
145465	145898	*/
145466	145899	ExprList pFuncArgs = 0; / Arguments to the coalesce() */
145467	145900	static const Token tkCoalesce = { "coalesce", 8 };
	145901	+ assert( pE1!=0 );
	145902	+ ExprSetProperty(pE1, EP_CanBeNull);
145468	145903	while( tableAndColumnIndex(pSrc, iLeft+1, i, zName, &iLeft, &iLeftCol,
145469	145904	pRight->fg.isSynthUsing)!=0 ){
145470	145905	if( pSrc->a[iLeft].fg.isUsing==0
145471	145906	\|\| sqlite3IdListIndex(pSrc->a[iLeft].u3.pUsing, zName)<0
145472	145907	){
		@@ -145479,11 +145914,17 @@
145479	145914	sqlite3SrcItemColumnUsed(&pSrc->a[iLeft], iLeftCol);
145480	145915	}
145481	145916	if( pFuncArgs ){
145482	145917	pFuncArgs = sqlite3ExprListAppend(pParse, pFuncArgs, pE1);
145483	145918	pE1 = sqlite3ExprFunction(pParse, pFuncArgs, &tkCoalesce, 0);
	145919	+ if( pE1 ){
	145920	+ pE1->affExpr = SQLITE_AFF_DEFER;
	145921	+ }
145484	145922	}
	145923	+ }else if( (pSrc->a[i+1].fg.jointype & JT_LEFT)!=0 && pParse->nErr==0 ){
	145924	+ assert( pE1!=0 );
	145925	+ ExprSetProperty(pE1, EP_CanBeNull);
145485	145926	}
145486	145927	pE2 = sqlite3CreateColumnExpr(db, pSrc, i+1, iRightCol);
145487	145928	sqlite3SrcItemColumnUsed(pRight, iRightCol);
145488	145929	pEq = sqlite3PExpr(pParse, TK_EQ, pE1, pE2);
145489	145930	assert( pE2!=0 \|\| pEq==0 );
		@@ -146956,10 +147397,14 @@
146956	147397	#else
146957	147398	zType = columnType(&sNC, p, 0, 0, 0);
146958	147399	#endif
146959	147400	sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
146960	147401	}
	147402	+#else
	147403	+ UNUSED_PARAMETER(pParse);
	147404	+ UNUSED_PARAMETER(pTabList);
	147405	+ UNUSED_PARAMETER(pEList);
146961	147406	#endif /* !defined(SQLITE_OMIT_DECLTYPE) */
146962	147407	}
146963	147408
146964	147409
146965	147410	/*
		@@ -147875,11 +148320,13 @@
147875	148320	int unionTab; /* Cursor number of the temp table holding result */
147876	148321	u8 op = 0; /* One of the SRT_ operations to apply to self */
147877	148322	int priorOp; /* The SRT_ operation to apply to prior selects */
147878	148323	Expr pLimit; / Saved values of p->nLimit */
147879	148324	int addr;
	148325	+ int emptyBypass = 0; /* IfEmpty opcode to bypass RHS */
147880	148326	SelectDest uniondest;
	148327	+
147881	148328
147882	148329	testcase( p->op==TK_EXCEPT );
147883	148330	testcase( p->op==TK_UNION );
147884	148331	priorOp = SRT_Union;
147885	148332	if( dest.eDest==priorOp ){
		@@ -147914,10 +148361,12 @@
147914	148361
147915	148362	/* Code the current SELECT statement
147916	148363	*/
147917	148364	if( p->op==TK_EXCEPT ){
147918	148365	op = SRT_Except;
	148366	+ emptyBypass = sqlite3VdbeAddOp1(v, OP_IfEmpty, unionTab);
	148367	+ VdbeCoverage(v);
147919	148368	}else{
147920	148369	assert( p->op==TK_UNION );
147921	148370	op = SRT_Union;
147922	148371	}
147923	148372	p->pPrior = 0;
		@@ -147934,10 +148383,11 @@
147934	148383	p->pPrior = pPrior;
147935	148384	p->pOrderBy = 0;
147936	148385	if( p->op==TK_UNION ){
147937	148386	p->nSelectRow = sqlite3LogEstAdd(p->nSelectRow, pPrior->nSelectRow);
147938	148387	}
	148388	+ if( emptyBypass ) sqlite3VdbeJumpHere(v, emptyBypass);
147939	148389	sqlite3ExprDelete(db, p->pLimit);
147940	148390	p->pLimit = pLimit;
147941	148391	p->iLimit = 0;
147942	148392	p->iOffset = 0;
147943	148393
		@@ -147964,13 +148414,14 @@
147964	148414	}
147965	148415	default: assert( p->op==TK_INTERSECT ); {
147966	148416	int tab1, tab2;
147967	148417	int iCont, iBreak, iStart;
147968	148418	Expr *pLimit;
147969		- int addr;
	148419	+ int addr, iLimit, iOffset;
147970	148420	SelectDest intersectdest;
147971	148421	int r1;
	148422	+ int emptyBypass;
147972	148423
147973	148424	/* INTERSECT is different from the others since it requires
147974	148425	** two temporary tables. Hence it has its own case. Begin
147975	148426	** by allocating the tables we will need.
147976	148427	*/
		@@ -147991,18 +148442,32 @@
147991	148442	rc = sqlite3Select(pParse, pPrior, &intersectdest);
147992	148443	if( rc ){
147993	148444	goto multi_select_end;
147994	148445	}
147995	148446
	148447	+ /* Initialize LIMIT counters before checking to see if the LHS
	148448	+ ** is empty, in case the jump is taken */
	148449	+ iBreak = sqlite3VdbeMakeLabel(pParse);
	148450	+ computeLimitRegisters(pParse, p, iBreak);
	148451	+ emptyBypass = sqlite3VdbeAddOp1(v, OP_IfEmpty, tab1); VdbeCoverage(v);
	148452	+
147996	148453	/* Code the current SELECT into temporary table "tab2"
147997	148454	*/
147998	148455	addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, tab2, 0);
147999	148456	assert( p->addrOpenEphm[1] == -1 );
148000	148457	p->addrOpenEphm[1] = addr;
148001		- p->pPrior = 0;
	148458	+
	148459	+ /* Disable prior SELECTs and the LIMIT counters during the computation
	148460	+ ** of the RHS select */
148002	148461	pLimit = p->pLimit;
	148462	+ iLimit = p->iLimit;
	148463	+ iOffset = p->iOffset;
	148464	+ p->pPrior = 0;
148003	148465	p->pLimit = 0;
	148466	+ p->iLimit = 0;
	148467	+ p->iOffset = 0;
	148468	+
148004	148469	intersectdest.iSDParm = tab2;
148005	148470	ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
148006	148471	sqlite3SelectOpName(p->op)));
148007	148472	TREETRACE(0x400, pParse, p, ("multiSelect INTERSECT right...\n"));
148008	148473	rc = sqlite3Select(pParse, p, &intersectdest);
		@@ -148011,32 +148476,35 @@
148011	148476	p->pPrior = pPrior;
148012	148477	if( p->nSelectRow>pPrior->nSelectRow ){
148013	148478	p->nSelectRow = pPrior->nSelectRow;
148014	148479	}
148015	148480	sqlite3ExprDelete(db, p->pLimit);
	148481	+
	148482	+ /* Reinstate the LIMIT counters prior to running the final intersect */
148016	148483	p->pLimit = pLimit;
	148484	+ p->iLimit = iLimit;
	148485	+ p->iOffset = iOffset;
148017	148486
148018	148487	/* Generate code to take the intersection of the two temporary
148019	148488	** tables.
148020	148489	*/
148021	148490	if( rc ) break;
148022	148491	assert( p->pEList );
148023		- iBreak = sqlite3VdbeMakeLabel(pParse);
148024		- iCont = sqlite3VdbeMakeLabel(pParse);
148025		- computeLimitRegisters(pParse, p, iBreak);
148026		- sqlite3VdbeAddOp2(v, OP_Rewind, tab1, iBreak); VdbeCoverage(v);
	148492	+ sqlite3VdbeAddOp1(v, OP_Rewind, tab1);
148027	148493	r1 = sqlite3GetTempReg(pParse);
148028	148494	iStart = sqlite3VdbeAddOp2(v, OP_RowData, tab1, r1);
	148495	+ iCont = sqlite3VdbeMakeLabel(pParse);
148029	148496	sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0);
148030	148497	VdbeCoverage(v);
148031	148498	sqlite3ReleaseTempReg(pParse, r1);
148032	148499	selectInnerLoop(pParse, p, tab1,
148033	148500	0, 0, &dest, iCont, iBreak);
148034	148501	sqlite3VdbeResolveLabel(v, iCont);
148035	148502	sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart); VdbeCoverage(v);
148036	148503	sqlite3VdbeResolveLabel(v, iBreak);
148037	148504	sqlite3VdbeAddOp2(v, OP_Close, tab2, 0);
	148505	+ sqlite3VdbeJumpHere(v, emptyBypass);
148038	148506	sqlite3VdbeAddOp2(v, OP_Close, tab1, 0);
148039	148507	break;
148040	148508	}
148041	148509	}
148042	148510
		@@ -148711,10 +149179,11 @@
148711	149179	typedef struct SubstContext {
148712	149180	Parse pParse; / The parsing context */
148713	149181	int iTable; /* Replace references to this table */
148714	149182	int iNewTable; /* New table number */
148715	149183	int isOuterJoin; /* Add TK_IF_NULL_ROW opcodes on each replacement */
	149184	+ int nSelDepth; /* Depth of sub-query recursion. Top==1 */
148716	149185	ExprList pEList; / Replacement expressions */
148717	149186	ExprList pCList; / Collation sequences for replacement expr */
148718	149187	} SubstContext;
148719	149188
148720	149189	/* Forward Declarations */
		@@ -148817,10 +149286,13 @@
148817	149286	}
148818	149287	}
148819	149288	}else{
148820	149289	if( pExpr->op==TK_IF_NULL_ROW && pExpr->iTable==pSubst->iTable ){
148821	149290	pExpr->iTable = pSubst->iNewTable;
	149291	+ }
	149292	+ if( pExpr->op==TK_AGG_FUNCTION && pExpr->op2>=pSubst->nSelDepth ){
	149293	+ pExpr->op2--;
148822	149294	}
148823	149295	pExpr->pLeft = substExpr(pSubst, pExpr->pLeft);
148824	149296	pExpr->pRight = substExpr(pSubst, pExpr->pRight);
148825	149297	if( ExprUseXSelect(pExpr) ){
148826	149298	substSelect(pSubst, pExpr->x.pSelect, 1);
		@@ -148855,10 +149327,11 @@
148855	149327	){
148856	149328	SrcList *pSrc;
148857	149329	SrcItem *pItem;
148858	149330	int i;
148859	149331	if( !p ) return;
	149332	+ pSubst->nSelDepth++;
148860	149333	do{
148861	149334	substExprList(pSubst, p->pEList);
148862	149335	substExprList(pSubst, p->pGroupBy);
148863	149336	substExprList(pSubst, p->pOrderBy);
148864	149337	p->pHaving = substExpr(pSubst, p->pHaving);
		@@ -148872,10 +149345,11 @@
148872	149345	if( pItem->fg.isTabFunc ){
148873	149346	substExprList(pSubst, pItem->u1.pFuncArg);
148874	149347	}
148875	149348	}
148876	149349	}while( doPrior && (p = p->pPrior)!=0 );
	149350	+ pSubst->nSelDepth--;
148877	149351	}
148878	149352	#endif /* !defined(SQLITE_OMIT_SUBQUERY) \|\| !defined(SQLITE_OMIT_VIEW) */
148879	149353
148880	149354	#if !defined(SQLITE_OMIT_SUBQUERY) \|\| !defined(SQLITE_OMIT_VIEW)
148881	149355	/*
		@@ -149087,13 +149561,13 @@
149087	149561	** other than the one FROM-clause subquery that is a candidate
149088	149562	** for flattening. (This is due to ticket [2f7170d73bf9abf80]
149089	149563	** from 2015-02-09.)
149090	149564	**
149091	149565	** (3) If the subquery is the right operand of a LEFT JOIN then
149092		-** (3a) the subquery may not be a join and
149093		-** (3b) the FROM clause of the subquery may not contain a virtual
149094		-** table and
	149566	+** (3a) the subquery may not be a join
	149567	+ () Was (3b): "the FROM clause of the subquery may not contain
	149568	+** a virtual table"
149095	149569	() Was: "The outer query may not have a GROUP BY." This case
149096	149570	** is now managed correctly
149097	149571	** (3d) the outer query may not be DISTINCT.
149098	149572	** See also (26) for restrictions on RIGHT JOIN.
149099	149573	**
		@@ -149305,11 +149779,11 @@
149305	149779	**
149306	149780	** See also tickets #306, #350, and #3300.
149307	149781	*/
149308	149782	if( (pSubitem->fg.jointype & (JT_OUTER\|JT_LTORJ))!=0 ){
149309	149783	if( pSubSrc->nSrc>1 /* (3a) */
149310		- \|\| IsVirtual(pSubSrc->a[0].pSTab) /* (3b) */
	149784	+ /**** \|\| IsVirtual(pSubSrc->a[0].pSTab) (3b)-omitted */
149311	149785	\|\| (p->selFlags & SF_Distinct)!=0 /* (3d) */
149312	149786	\|\| (pSubitem->fg.jointype & JT_RIGHT)!=0 /* (26) */
149313	149787	){
149314	149788	return 0;
149315	149789	}
		@@ -149483,11 +149957,11 @@
149483	149957	/* Defer deleting the Table object associated with the
149484	149958	** subquery until code generation is
149485	149959	** complete, since there may still exist Expr.pTab entries that
149486	149960	** refer to the subquery even after flattening. Ticket #3346.
149487	149961	**
149488		- ** pSubitem->pTab is always non-NULL by test restrictions and tests above.
	149962	+ ** pSubitem->pSTab is always non-NULL by test restrictions and tests above.
149489	149963	*/
149490	149964	if( ALWAYS(pSubitem->pSTab!=0) ){
149491	149965	Table *pTabToDel = pSubitem->pSTab;
149492	149966	if( pTabToDel->nTabRef==1 ){
149493	149967	Parse *pToplevel = sqlite3ParseToplevel(pParse);
		@@ -149613,10 +150087,11 @@
149613	150087	SubstContext x;
149614	150088	x.pParse = pParse;
149615	150089	x.iTable = iParent;
149616	150090	x.iNewTable = iNewParent;
149617	150091	x.isOuterJoin = isOuterJoin;
	150092	+ x.nSelDepth = 0;
149618	150093	x.pEList = pSub->pEList;
149619	150094	x.pCList = findLeftmostExprlist(pSub);
149620	150095	substSelect(&x, pParent, 0);
149621	150096	}
149622	150097
		@@ -150198,10 +150673,11 @@
150198	150673	unsetJoinExpr(pNew, -1, 1);
150199	150674	x.pParse = pParse;
150200	150675	x.iTable = pSrc->iCursor;
150201	150676	x.iNewTable = pSrc->iCursor;
150202	150677	x.isOuterJoin = 0;
	150678	+ x.nSelDepth = 0;
150203	150679	x.pEList = pSubq->pEList;
150204	150680	x.pCList = findLeftmostExprlist(pSubq);
150205	150681	pNew = substExpr(&x, pNew);
150206	150682	#ifndef SQLITE_OMIT_WINDOWFUNC
150207	150683	if( pSubq->pWin && 0==pushDownWindowCheck(pParse, pSubq, pNew) ){
		@@ -150595,11 +151071,11 @@
150595	151071	** a WITH clause on the stack currently maintained by the parser (on the
150596	151072	** pParse->pWith linked list). And if currently processing a CTE
150597	151073	** CTE expression, through routine checks to see if the reference is
150598	151074	** a recursive reference to the CTE.
150599	151075	**
150600		-** If pFrom matches a CTE according to either of these two above, pFrom->pTab
	151076	+** If pFrom matches a CTE according to either of these two above, pFrom->pSTab
150601	151077	** and other fields are populated accordingly.
150602	151078	**
150603	151079	** Return 0 if no match is found.
150604	151080	** Return 1 if a match is found.
150605	151081	** Return 2 if an error condition is detected.
		@@ -152221,10 +152697,87 @@
152221	152697	pItem--;
152222	152698	if( pItem->fg.isSubquery ) return 0; /* (1c-i) */
152223	152699	}
152224	152700	return 1;
152225	152701	}
	152702	+
	152703	+/*
	152704	+** Argument pWhere is the WHERE clause belonging to SELECT statement p. This
	152705	+** function attempts to transform expressions of the form:
	152706	+**
	152707	+** EXISTS (SELECT ...)
	152708	+**
	152709	+** into joins. For example, given
	152710	+**
	152711	+** CREATE TABLE sailors(sid INTEGER PRIMARY KEY, name TEXT);
	152712	+** CREATE TABLE reserves(sid INT, day DATE, PRIMARY KEY(sid, day));
	152713	+**
	152714	+** SELECT name FROM sailors AS S WHERE EXISTS (
	152715	+** SELECT * FROM reserves AS R WHERE S.sid = R.sid AND R.day = '2022-10-25'
	152716	+** );
	152717	+**
	152718	+** the SELECT statement may be transformed as follows:
	152719	+**
	152720	+** SELECT name FROM sailors AS S, reserves AS R
	152721	+** WHERE S.sid = R.sid AND R.day = '2022-10-25';
	152722	+**
	152723	+ Approximately**. Really, we have to ensure that the FROM-clause term
	152724	+** that was formerly inside the EXISTS is only executed once. This is handled
	152725	+** by setting the SrcItem.fg.fromExists flag, which then causes code in
	152726	+** the where.c file to exit the corresponding loop after the first successful
	152727	+** match (if any).
	152728	+*/
	152729	+static SQLITE_NOINLINE void existsToJoin(
	152730	+ Parse pParse, / Parsing context */
	152731	+ Select p, / The SELECT statement being optimized */
	152732	+ Expr pWhere / part of the WHERE clause currently being examined */
	152733	+){
	152734	+ if( pParse->nErr==0
	152735	+ && pWhere!=0
	152736	+ && !ExprHasProperty(pWhere, EP_OuterON\|EP_InnerON)
	152737	+ && ALWAYS(p->pSrc!=0)
	152738	+ && p->pSrc->nSrc<BMS
	152739	+ ){
	152740	+ if( pWhere->op==TK_AND ){
	152741	+ Expr *pRight = pWhere->pRight;
	152742	+ existsToJoin(pParse, p, pWhere->pLeft);
	152743	+ existsToJoin(pParse, p, pRight);
	152744	+ }
	152745	+ else if( pWhere->op==TK_EXISTS ){
	152746	+ Select *pSub = pWhere->x.pSelect;
	152747	+ Expr *pSubWhere = pSub->pWhere;
	152748	+ if( pSub->pSrc->nSrc==1
	152749	+ && (pSub->selFlags & SF_Aggregate)==0
	152750	+ && !pSub->pSrc->a[0].fg.isSubquery
	152751	+ ){
	152752	+ memset(pWhere, 0, sizeof(*pWhere));
	152753	+ pWhere->op = TK_INTEGER;
	152754	+ pWhere->u.iValue = 1;
	152755	+ ExprSetProperty(pWhere, EP_IntValue);
	152756	+
	152757	+ assert( p->pWhere!=0 );
	152758	+ pSub->pSrc->a[0].fg.fromExists = 1;
	152759	+ pSub->pSrc->a[0].fg.jointype \|= JT_CROSS;
	152760	+ p->pSrc = sqlite3SrcListAppendList(pParse, p->pSrc, pSub->pSrc);
	152761	+ if( pSubWhere ){
	152762	+ p->pWhere = sqlite3PExpr(pParse, TK_AND, p->pWhere, pSubWhere);
	152763	+ pSub->pWhere = 0;
	152764	+ }
	152765	+ pSub->pSrc = 0;
	152766	+ sqlite3ParserAddCleanup(pParse, sqlite3SelectDeleteGeneric, pSub);
	152767	+#if TREETRACE_ENABLED
	152768	+ if( sqlite3TreeTrace & 0x100000 ){
	152769	+ TREETRACE(0x100000,pParse,p,
	152770	+ ("After EXISTS-to-JOIN optimization:\n"));
	152771	+ sqlite3TreeViewSelect(0, p, 0);
	152772	+ }
	152773	+#endif
	152774	+ existsToJoin(pParse, p, pSubWhere);
	152775	+ }
	152776	+ }
	152777	+ }
	152778	+}
152226	152779
152227	152780	/*
152228	152781	** Generate byte-code for the SELECT statement given in the p argument.
152229	152782	**
152230	152783	** The results are returned according to the SelectDest structure.
		@@ -152589,10 +153142,17 @@
152589	153142	#endif
152590	153143	if( p->pNext==0 ) ExplainQueryPlanPop(pParse);
152591	153144	return rc;
152592	153145	}
152593	153146	#endif
	153147	+
	153148	+ /* If there may be an "EXISTS (SELECT ...)" in the WHERE clause, attempt
	153149	+ ** to change it into a join. */
	153150	+ if( pParse->bHasExists && OptimizationEnabled(db,SQLITE_ExistsToJoin) ){
	153151	+ existsToJoin(pParse, p, p->pWhere);
	153152	+ pTabList = p->pSrc;
	153153	+ }
152594	153154
152595	153155	/* Do the WHERE-clause constant propagation optimization if this is
152596	153156	** a join. No need to spend time on this operation for non-join queries
152597	153157	** as the equivalent optimization will be handled by query planner in
152598	153158	** sqlite3WhereBegin(). tag-select-0330
		@@ -153349,10 +153909,14 @@
153349	153909	}
153350	153910
153351	153911	if( iOrderByCol ){
153352	153912	Expr *pX = p->pEList->a[iOrderByCol-1].pExpr;
153353	153913	Expr *pBase = sqlite3ExprSkipCollateAndLikely(pX);
	153914	+ while( ALWAYS(pBase!=0) && pBase->op==TK_IF_NULL_ROW ){
	153915	+ pX = pBase->pLeft;
	153916	+ pBase = sqlite3ExprSkipCollateAndLikely(pX);
	153917	+ }
153354	153918	if( ALWAYS(pBase!=0)
153355	153919	&& pBase->op!=TK_AGG_COLUMN
153356	153920	&& pBase->op!=TK_REGISTER
153357	153921	){
153358	153922	sqlite3ExprToRegister(pX, iAMem+j);
		@@ -153372,24 +153936,24 @@
153372	153936	** over to a0,a1,a2. It then calls the output subroutine
153373	153937	** and resets the aggregate accumulator registers in preparation
153374	153938	** for the next GROUP BY batch.
153375	153939	*/
153376	153940	sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
153377		- VdbeComment((v, "output one row"));
	153941	+ VdbeComment((v, "output one row of %d", p->selId));
153378	153942	sqlite3ExprCodeMove(pParse, iBMem, iAMem, pGroupBy->nExpr);
153379	153943	sqlite3VdbeAddOp2(v, OP_IfPos, iAbortFlag, addrEnd); VdbeCoverage(v);
153380	153944	VdbeComment((v, "check abort flag"));
153381	153945	sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
153382		- VdbeComment((v, "reset accumulator"));
	153946	+ VdbeComment((v, "reset accumulator %d", p->selId));
153383	153947
153384	153948	/* Update the aggregate accumulators based on the content of
153385	153949	** the current row
153386	153950	*/
153387	153951	sqlite3VdbeJumpHere(v, addr1);
153388	153952	updateAccumulator(pParse, iUseFlag, pAggInfo, eDist);
153389	153953	sqlite3VdbeAddOp2(v, OP_Integer, 1, iUseFlag);
153390		- VdbeComment((v, "indicate data in accumulator"));
	153954	+ VdbeComment((v, "indicate data in accumulator %d", p->selId));
153391	153955
153392	153956	/* End of the loop
153393	153957	*/
153394	153958	if( groupBySort ){
153395	153959	sqlite3VdbeAddOp2(v, OP_SorterNext, pAggInfo->sortingIdx,addrTopOfLoop);
		@@ -153402,11 +153966,11 @@
153402	153966	sqlite3ExprListDelete(db, pDistinct);
153403	153967
153404	153968	/* Output the final row of result
153405	153969	*/
153406	153970	sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
153407		- VdbeComment((v, "output final row"));
	153971	+ VdbeComment((v, "output final row of %d", p->selId));
153408	153972
153409	153973	/* Jump over the subroutines
153410	153974	*/
153411	153975	sqlite3VdbeGoto(v, addrEnd);
153412	153976
		@@ -153423,26 +153987,26 @@
153423	153987	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153424	153988	sqlite3VdbeResolveLabel(v, addrOutputRow);
153425	153989	addrOutputRow = sqlite3VdbeCurrentAddr(v);
153426	153990	sqlite3VdbeAddOp2(v, OP_IfPos, iUseFlag, addrOutputRow+2);
153427	153991	VdbeCoverage(v);
153428		- VdbeComment((v, "Groupby result generator entry point"));
	153992	+ VdbeComment((v, "Groupby result generator entry point %d", p->selId));
153429	153993	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153430	153994	finalizeAggFunctions(pParse, pAggInfo);
153431	153995	sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
153432	153996	selectInnerLoop(pParse, p, -1, &sSort,
153433	153997	&sDistinct, pDest,
153434	153998	addrOutputRow+1, addrSetAbort);
153435	153999	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153436		- VdbeComment((v, "end groupby result generator"));
	154000	+ VdbeComment((v, "end groupby result generator %d", p->selId));
153437	154001
153438	154002	/* Generate a subroutine that will reset the group-by accumulator
153439	154003	*/
153440	154004	sqlite3VdbeResolveLabel(v, addrReset);
153441	154005	resetAccumulator(pParse, pAggInfo);
153442	154006	sqlite3VdbeAddOp2(v, OP_Integer, 0, iUseFlag);
153443		- VdbeComment((v, "indicate accumulator empty"));
	154007	+ VdbeComment((v, "indicate accumulator %d empty", p->selId));
153444	154008	sqlite3VdbeAddOp1(v, OP_Return, regReset);
153445	154009
153446	154010	if( distFlag!=0 && eDist!=WHERE_DISTINCT_NOOP ){
153447	154011	struct AggInfo_func *pF = &pAggInfo->aFunc[0];
153448	154012	fixDistinctOpenEph(pParse, eDist, pF->iDistinct, pF->iDistAddr);
		@@ -157326,11 +157890,12 @@
157326	157890	saved_flags = db->flags;
157327	157891	saved_mDbFlags = db->mDbFlags;
157328	157892	saved_nChange = db->nChange;
157329	157893	saved_nTotalChange = db->nTotalChange;
157330	157894	saved_mTrace = db->mTrace;
157331		- db->flags \|= SQLITE_WriteSchema \| SQLITE_IgnoreChecks \| SQLITE_Comments;
	157895	+ db->flags \|= SQLITE_WriteSchema \| SQLITE_IgnoreChecks \| SQLITE_Comments
	157896	+ \| SQLITE_AttachCreate \| SQLITE_AttachWrite;
157332	157897	db->mDbFlags \|= DBFLAG_PreferBuiltin \| DBFLAG_Vacuum;
157333	157898	db->flags &= ~(u64)(SQLITE_ForeignKeys \| SQLITE_ReverseOrder
157334	157899	\| SQLITE_Defensive \| SQLITE_CountRows);
157335	157900	db->mTrace = 0;
157336	157901
		@@ -159029,10 +159594,11 @@
159029	159594	struct WhereLevel {
159030	159595	int iLeftJoin; /* Memory cell used to implement LEFT OUTER JOIN */
159031	159596	int iTabCur; /* The VDBE cursor used to access the table */
159032	159597	int iIdxCur; /* The VDBE cursor used to access pIdx */
159033	159598	int addrBrk; /* Jump here to break out of the loop */
	159599	+ int addrHalt; /* Abort the query due to empty table or similar */
159034	159600	int addrNxt; /* Jump here to start the next IN combination */
159035	159601	int addrSkip; /* Jump here for next iteration of skip-scan */
159036	159602	int addrCont; /* Jump here to continue with the next loop cycle */
159037	159603	int addrFirst; /* First instruction of interior of the loop */
159038	159604	int addrBody; /* Beginning of the body of this loop */
		@@ -159234,10 +159800,13 @@
159234	159800	u16 eOperator; /* A WO_xx value describing <op> */
159235	159801	u8 nChild; /* Number of children that must disable us */
159236	159802	u8 eMatchOp; /* Op for vtab MATCH/LIKE/GLOB/REGEXP terms */
159237	159803	int iParent; /* Disable pWC->a[iParent] when this term disabled */
159238	159804	int leftCursor; /* Cursor number of X in "X <op> <expr>" */
	159805	+#ifdef SQLITE_DEBUG
	159806	+ int iTerm; /* Which WhereTerm is this, for debug purposes */
	159807	+#endif
159239	159808	union {
159240	159809	struct {
159241	159810	int leftColumn; /* Column number of X in "X <op> <expr>" */
159242	159811	int iField; /* Field in (?,?,?) IN (SELECT...) vector */
159243	159812	} x; /* Opcode other than OP_OR or OP_AND */
		@@ -159726,11 +160295,10 @@
159726	160295	#if !defined(SQLITE_DEBUG)
159727	160296	if( sqlite3ParseToplevel(pParse)->explain==2 \|\| IS_STMT_SCANSTATUS(pParse->db) )
159728	160297	#endif
159729	160298	{
159730	160299	VdbeOp *pOp = sqlite3VdbeGetOp(pParse->pVdbe, addr);
159731		-
159732	160300	SrcItem *pItem = &pTabList->a[pLevel->iFrom];
159733	160301	sqlite3 db = pParse->db; / Database handle */
159734	160302	int isSearch; /* True for a SEARCH. False for SCAN. */
159735	160303	WhereLoop pLoop; / The controlling WhereLoop object */
159736	160304	u32 flags; /* Flags that describe this loop */
		@@ -159749,11 +160317,14 @@
159749	160317	\|\| ((flags&WHERE_VIRTUALTABLE)==0 && (pLoop->u.btree.nEq>0))
159750	160318	\|\| (wctrlFlags&(WHERE_ORDERBY_MIN\|WHERE_ORDERBY_MAX));
159751	160319
159752	160320	sqlite3StrAccumInit(&str, db, zBuf, sizeof(zBuf), SQLITE_MAX_LENGTH);
159753	160321	str.printfFlags = SQLITE_PRINTF_INTERNAL;
159754		- sqlite3_str_appendf(&str, "%s %S", isSearch ? "SEARCH" : "SCAN", pItem);
	160322	+ sqlite3_str_appendf(&str, "%s %S%s",
	160323	+ isSearch ? "SEARCH" : "SCAN",
	160324	+ pItem,
	160325	+ pItem->fg.fromExists ? " EXISTS" : "");
159755	160326	if( (flags & (WHERE_IPK\|WHERE_VIRTUALTABLE))==0 ){
159756	160327	const char *zFmt = 0;
159757	160328	Index *pIdx;
159758	160329
159759	160330	assert( pLoop->u.btree.pIndex!=0 );
		@@ -160198,11 +160769,13 @@
160198	160769	for(i=iEq; i<pLoop->nLTerm; i++){
160199	160770	if( pLoop->aLTerm[i]->pExpr==pX ){
160200	160771	int iField;
160201	160772	assert( (pLoop->aLTerm[i]->eOperator & (WO_OR\|WO_AND))==0 );
160202	160773	iField = pLoop->aLTerm[i]->u.x.iField - 1;
160203		- if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */
	160774	+ if( NEVER(pOrigRhs->a[iField].pExpr==0) ){
	160775	+ continue; /* Duplicate PK column */
	160776	+ }
160204	160777	pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
160205	160778	pOrigRhs->a[iField].pExpr = 0;
160206	160779	if( pRhs ) pRhs->a[pRhs->nExpr-1].u.x.iOrderByCol = iField+1;
160207	160780	if( pOrigLhs ){
160208	160781	assert( pOrigLhs->a[iField].pExpr!=0 );
		@@ -160295,35 +160868,26 @@
160295	160868	if( pLoop->aLTerm[i] && pLoop->aLTerm[i]->pExpr==pX ){
160296	160869	disableTerm(pLevel, pTerm);
160297	160870	return;
160298	160871	}
160299	160872	}
160300		- for(i=iEq;i<pLoop->nLTerm; i++){
	160873	+ for(i=iEq; i<pLoop->nLTerm; i++){
160301	160874	assert( pLoop->aLTerm[i]!=0 );
160302	160875	if( pLoop->aLTerm[i]->pExpr==pX ) nEq++;
160303	160876	}
160304	160877
160305	160878	iTab = 0;
160306	160879	if( !ExprUseXSelect(pX) \|\| pX->x.pSelect->pEList->nExpr==1 ){
160307	160880	eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, 0, &iTab);
160308	160881	}else{
160309		- Expr *pExpr = pTerm->pExpr;
160310		- if( pExpr->iTable==0 \|\| !ExprHasProperty(pExpr, EP_Subrtn) ){
160311		- sqlite3 *db = pParse->db;
160312		- pX = removeUnindexableInClauseTerms(pParse, iEq, pLoop, pX);
160313		- if( !db->mallocFailed ){
160314		- aiMap = (int)sqlite3DbMallocZero(pParse->db, sizeof(int)nEq);
160315		- eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, aiMap,&iTab);
160316		- pExpr->iTable = iTab;
160317		- }
160318		- sqlite3ExprDelete(db, pX);
160319		- }else{
160320		- int n = sqlite3ExprVectorSize(pX->pLeft);
160321		- aiMap = (int)sqlite3DbMallocZero(pParse->db, sizeof(int)MAX(nEq,n));
160322		- eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, aiMap, &iTab);
160323		- }
160324		- pX = pExpr;
	160882	+ sqlite3 *db = pParse->db;
	160883	+ Expr *pXMod = removeUnindexableInClauseTerms(pParse, iEq, pLoop, pX);
	160884	+ if( !db->mallocFailed ){
	160885	+ aiMap = (int)sqlite3DbMallocZero(db, sizeof(int)nEq);
	160886	+ eType = sqlite3FindInIndex(pParse, pXMod, IN_INDEX_LOOP, 0, aiMap, &iTab);
	160887	+ }
	160888	+ sqlite3ExprDelete(db, pXMod);
160325	160889	}
160326	160890
160327	160891	if( eType==IN_INDEX_INDEX_DESC ){
160328	160892	testcase( bRev );
160329	160893	bRev = !bRev;
		@@ -160349,11 +160913,11 @@
160349	160913	sizeof(pLevel->u.in.aInLoop[0])*pLevel->u.in.nIn);
160350	160914	pIn = pLevel->u.in.aInLoop;
160351	160915	if( pIn ){
160352	160916	int iMap = 0; /* Index in aiMap[] */
160353	160917	pIn += i;
160354		- for(i=iEq;i<pLoop->nLTerm; i++){
	160918	+ for(i=iEq; i<pLoop->nLTerm; i++){
160355	160919	if( pLoop->aLTerm[i]->pExpr==pX ){
160356	160920	int iOut = iTarget + i - iEq;
160357	160921	if( eType==IN_INDEX_ROWID ){
160358	160922	pIn->addrInTop = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iOut);
160359	160923	}else{
		@@ -161000,19 +161564,20 @@
161000	161564	WhereInfo pWInfo, / Complete information about the WHERE clause */
161001	161565	int iLevel, /* Which level of pWInfo->a[] should be coded */
161002	161566	int addrNxt, /* Jump here to bypass inner loops */
161003	161567	Bitmask notReady /* Loops that are not ready */
161004	161568	){
	161569	+ int saved_addrBrk;
161005	161570	while( ++iLevel < pWInfo->nLevel ){
161006	161571	WhereLevel *pLevel = &pWInfo->a[iLevel];
161007	161572	WhereLoop *pLoop = pLevel->pWLoop;
161008	161573	if( pLevel->regFilter==0 ) continue;
161009	161574	if( pLevel->pWLoop->nSkip ) continue;
161010	161575	/* ,--- Because sqlite3ConstructBloomFilter() has will not have set
161011	161576	** vvvvv--' pLevel->regFilter if this were true. */
161012	161577	if( NEVER(pLoop->prereq & notReady) ) continue;
161013		- assert( pLevel->addrBrk==0 );
	161578	+ saved_addrBrk = pLevel->addrBrk;
161014	161579	pLevel->addrBrk = addrNxt;
161015	161580	if( pLoop->wsFlags & WHERE_IPK ){
161016	161581	WhereTerm *pTerm = pLoop->aLTerm[0];
161017	161582	int regRowid;
161018	161583	assert( pTerm!=0 );
		@@ -161038,11 +161603,11 @@
161038	161603	sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
161039	161604	addrNxt, r1, nEq);
161040	161605	VdbeCoverage(pParse->pVdbe);
161041	161606	}
161042	161607	pLevel->regFilter = 0;
161043		- pLevel->addrBrk = 0;
	161608	+ pLevel->addrBrk = saved_addrBrk;
161044	161609	}
161045	161610	}
161046	161611
161047	161612	/*
161048	161613	** Loop pLoop is a WHERE_INDEXED level that uses at least one IN(...)
		@@ -161085,11 +161650,10 @@
161085	161650	WhereClause pWC; / Decomposition of the entire WHERE clause */
161086	161651	WhereTerm pTerm; / A WHERE clause term */
161087	161652	sqlite3 db; / Database connection */
161088	161653	SrcItem pTabItem; / FROM clause term being coded */
161089	161654	int addrBrk; /* Jump here to break out of the loop */
161090		- int addrHalt; /* addrBrk for the outermost loop */
161091	161655	int addrCont; /* Jump here to continue with next cycle */
161092	161656	int iRowidReg = 0; /* Rowid is stored in this register, if not zero */
161093	161657	int iReleaseReg = 0; /* Temp register to free before returning */
161094	161658	Index pIdx = 0; / Index used by loop (if any) */
161095	161659	int iLoop; /* Iteration of constraint generator loop */
		@@ -161129,11 +161693,11 @@
161129	161693	** When there is an IN operator, we also have a "addrNxt" label that
161130	161694	** means to continue with the next IN value combination. When
161131	161695	** there are no IN operators in the constraints, the "addrNxt" label
161132	161696	** is the same as "addrBrk".
161133	161697	*/
161134		- addrBrk = pLevel->addrBrk = pLevel->addrNxt = sqlite3VdbeMakeLabel(pParse);
	161698	+ addrBrk = pLevel->addrNxt = pLevel->addrBrk;
161135	161699	addrCont = pLevel->addrCont = sqlite3VdbeMakeLabel(pParse);
161136	161700
161137	161701	/* If this is the right table of a LEFT OUTER JOIN, allocate and
161138	161702	** initialize a memory cell that records if this table matches any
161139	161703	** row of the left table of the join.
		@@ -161145,18 +161709,10 @@
161145	161709	pLevel->iLeftJoin = ++pParse->nMem;
161146	161710	sqlite3VdbeAddOp2(v, OP_Integer, 0, pLevel->iLeftJoin);
161147	161711	VdbeComment((v, "init LEFT JOIN match flag"));
161148	161712	}
161149	161713
161150		- /* Compute a safe address to jump to if we discover that the table for
161151		- ** this loop is empty and can never contribute content. */
161152		- for(j=iLevel; j>0; j--){
161153		- if( pWInfo->a[j].iLeftJoin ) break;
161154		- if( pWInfo->a[j].pRJ ) break;
161155		- }
161156		- addrHalt = pWInfo->a[j].addrBrk;
161157		-
161158	161714	/* Special case of a FROM clause subquery implemented as a co-routine */
161159	161715	if( pTabItem->fg.viaCoroutine ){
161160	161716	int regYield;
161161	161717	Subquery *pSubq;
161162	161718	assert( pTabItem->fg.isSubquery && pTabItem->u4.pSubq!=0 );
		@@ -161391,11 +161947,11 @@
161391	161947	VdbeCoverageIf(v, pX->op==TK_LE);
161392	161948	VdbeCoverageIf(v, pX->op==TK_LT);
161393	161949	VdbeCoverageIf(v, pX->op==TK_GE);
161394	161950	sqlite3ReleaseTempReg(pParse, rTemp);
161395	161951	}else{
161396		- sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, addrHalt);
	161952	+ sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, pLevel->addrHalt);
161397	161953	VdbeCoverageIf(v, bRev==0);
161398	161954	VdbeCoverageIf(v, bRev!=0);
161399	161955	}
161400	161956	if( pEnd ){
161401	161957	Expr *pX;
		@@ -161431,40 +161987,40 @@
161431	161987	VdbeCoverageIf(v, testOp==OP_Ge);
161432	161988	VdbeCoverageIf(v, testOp==OP_Gt);
161433	161989	sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC \| SQLITE_JUMPIFNULL);
161434	161990	}
161435	161991	}else if( pLoop->wsFlags & WHERE_INDEXED ){
161436		- /* Case 4: A scan using an index.
161437		- **
161438		- ** The WHERE clause may contain zero or more equality
161439		- ** terms ("==" or "IN" operators) that refer to the N
161440		- ** left-most columns of the index. It may also contain
161441		- ** inequality constraints (>, <, >= or <=) on the indexed
161442		- ** column that immediately follows the N equalities. Only
161443		- ** the right-most column can be an inequality - the rest must
161444		- ** use the "==" and "IN" operators. For example, if the
161445		- ** index is on (x,y,z), then the following clauses are all
161446		- ** optimized:
161447		- **
161448		- ** x=5
161449		- ** x=5 AND y=10
161450		- ** x=5 AND y<10
161451		- ** x=5 AND y>5 AND y<10
161452		- ** x=5 AND y=5 AND z<=10
161453		- **
161454		- ** The z<10 term of the following cannot be used, only
161455		- ** the x=5 term:
161456		- **
161457		- ** x=5 AND z<10
161458		- **
161459		- ** N may be zero if there are inequality constraints.
161460		- ** If there are no inequality constraints, then N is at
161461		- ** least one.
161462		- **
161463		- ** This case is also used when there are no WHERE clause
161464		- ** constraints but an index is selected anyway, in order
161465		- ** to force the output order to conform to an ORDER BY.
	161992	+ /* Case 4: Search using an index.
	161993	+ **
	161994	+ ** The WHERE clause may contain zero or more equality
	161995	+ ** terms ("==" or "IN" or "IS" operators) that refer to the N
	161996	+ ** left-most columns of the index. It may also contain
	161997	+ ** inequality constraints (>, <, >= or <=) on the indexed
	161998	+ ** column that immediately follows the N equalities. Only
	161999	+ ** the right-most column can be an inequality - the rest must
	162000	+ ** use the "==", "IN", or "IS" operators. For example, if the
	162001	+ ** index is on (x,y,z), then the following clauses are all
	162002	+ ** optimized:
	162003	+ **
	162004	+ ** x=5
	162005	+ ** x=5 AND y=10
	162006	+ ** x=5 AND y<10
	162007	+ ** x=5 AND y>5 AND y<10
	162008	+ ** x=5 AND y=5 AND z<=10
	162009	+ **
	162010	+ ** The z<10 term of the following cannot be used, only
	162011	+ ** the x=5 term:
	162012	+ **
	162013	+ ** x=5 AND z<10
	162014	+ **
	162015	+ ** N may be zero if there are inequality constraints.
	162016	+ ** If there are no inequality constraints, then N is at
	162017	+ ** least one.
	162018	+ **
	162019	+ ** This case is also used when there are no WHERE clause
	162020	+ ** constraints but an index is selected anyway, in order
	162021	+ ** to force the output order to conform to an ORDER BY.
161466	162022	*/
161467	162023	static const u8 aStartOp[] = {
161468	162024	0,
161469	162025	0,
161470	162026	OP_Rewind, /* 2: (!start_constraints && startEq && !bRev) */
		@@ -161801,16 +162357,17 @@
161801	162357	}
161802	162358
161803	162359	if( pLevel->iLeftJoin==0 ){
161804	162360	/* If a partial index is driving the loop, try to eliminate WHERE clause
161805	162361	** terms from the query that must be true due to the WHERE clause of
161806		- ** the partial index.
	162362	+ ** the partial index. This optimization does not work on an outer join,
	162363	+ ** as shown by:
161807	162364	**
161808		- ** 2019-11-02 ticket 623eff57e76d45f6: This optimization does not work
161809		- ** for a LEFT JOIN.
	162365	+ ** 2019-11-02 ticket 623eff57e76d45f6 (LEFT JOIN)
	162366	+ ** 2025-05-29 forum post 7dee41d32506c4ae (RIGHT JOIN)
161810	162367	*/
161811		- if( pIdx->pPartIdxWhere ){
	162368	+ if( pIdx->pPartIdxWhere && pLevel->pRJ==0 ){
161812	162369	whereApplyPartialIndexConstraints(pIdx->pPartIdxWhere, iCur, pWC);
161813	162370	}
161814	162371	}else{
161815	162372	testcase( pIdx->pPartIdxWhere );
161816	162373	/* The following assert() is not a requirement, merely an observation:
		@@ -162185,11 +162742,11 @@
162185	162742	pLevel->op = OP_Noop;
162186	162743	}else{
162187	162744	codeCursorHint(pTabItem, pWInfo, pLevel, 0);
162188	162745	pLevel->op = aStep[bRev];
162189	162746	pLevel->p1 = iCur;
162190		- pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, aStart[bRev], iCur, addrHalt);
	162747	+ pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, aStart[bRev],iCur,pLevel->addrHalt);
162191	162748	VdbeCoverageIf(v, bRev==0);
162192	162749	VdbeCoverageIf(v, bRev!=0);
162193	162750	pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
162194	162751	}
162195	162752	}
		@@ -163479,34 +164036,46 @@
163479	164036	** column references. This routine checks to see if pExpr is an equivalence
163480	164037	** relation:
163481	164038	** 1. The SQLITE_Transitive optimization must be enabled
163482	164039	** 2. Must be either an == or an IS operator
163483	164040	** 3. Not originating in the ON clause of an OUTER JOIN
163484		-** 4. The affinities of A and B must be compatible
163485		-** 5a. Both operands use the same collating sequence OR
163486		-** 5b. The overall collating sequence is BINARY
	164041	+** 4. The operator is not IS or else the query does not contain RIGHT JOIN
	164042	+** 5. The affinities of A and B must be compatible
	164043	+** 6a. Both operands use the same collating sequence OR
	164044	+** 6b. The overall collating sequence is BINARY
163487	164045	** If this routine returns TRUE, that means that the RHS can be substituted
163488	164046	** for the LHS anyplace else in the WHERE clause where the LHS column occurs.
163489	164047	** This is an optimization. No harm comes from returning 0. But if 1 is
163490	164048	** returned when it should not be, then incorrect answers might result.
163491	164049	*/
163492		-static int termIsEquivalence(Parse pParse, Expr pExpr){
	164050	+static int termIsEquivalence(Parse pParse, Expr pExpr, SrcList *pSrc){
163493	164051	char aff1, aff2;
163494	164052	CollSeq *pColl;
163495		- if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0;
163496		- if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0;
163497		- if( ExprHasProperty(pExpr, EP_OuterON) ) return 0;
	164053	+ if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0; /* (1) */
	164054	+ if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0; /* (2) */
	164055	+ if( ExprHasProperty(pExpr, EP_OuterON) ) return 0; /* (3) */
	164056	+ assert( pSrc!=0 );
	164057	+ if( pExpr->op==TK_IS
	164058	+ && pSrc->nSrc>=2
	164059	+ && (pSrc->a[0].fg.jointype & JT_LTORJ)!=0
	164060	+ ){
	164061	+ return 0; /* (4) */
	164062	+ }
163498	164063	aff1 = sqlite3ExprAffinity(pExpr->pLeft);
163499	164064	aff2 = sqlite3ExprAffinity(pExpr->pRight);
163500	164065	if( aff1!=aff2
163501	164066	&& (!sqlite3IsNumericAffinity(aff1) \|\| !sqlite3IsNumericAffinity(aff2))
163502	164067	){
163503		- return 0;
	164068	+ return 0; /* (5) */
163504	164069	}
163505	164070	pColl = sqlite3ExprCompareCollSeq(pParse, pExpr);
163506		- if( sqlite3IsBinary(pColl) ) return 1;
163507		- return sqlite3ExprCollSeqMatch(pParse, pExpr->pLeft, pExpr->pRight);
	164071	+ if( !sqlite3IsBinary(pColl)
	164072	+ && !sqlite3ExprCollSeqMatch(pParse, pExpr->pLeft, pExpr->pRight)
	164073	+ ){
	164074	+ return 0; /* (6) */
	164075	+ }
	164076	+ return 1;
163508	164077	}
163509	164078
163510	164079	/*
163511	164080	** Recursively walk the expressions of a SELECT statement and generate
163512	164081	** a bitmask indicating which tables are used in that expression
		@@ -163660,10 +164229,13 @@
163660	164229	if( db->mallocFailed ){
163661	164230	return;
163662	164231	}
163663	164232	assert( pWC->nTerm > idxTerm );
163664	164233	pTerm = &pWC->a[idxTerm];
	164234	+#ifdef SQLITE_DEBUG
	164235	+ pTerm->iTerm = idxTerm;
	164236	+#endif
163665	164237	pMaskSet = &pWInfo->sMaskSet;
163666	164238	pExpr = pTerm->pExpr;
163667	164239	assert( pExpr!=0 ); /* Because malloc() has not failed */
163668	164240	assert( pExpr->op!=TK_AS && pExpr->op!=TK_COLLATE );
163669	164241	pMaskSet->bVarSelect = 0;
		@@ -163767,12 +164339,12 @@
163767	164339	pNew = &pWC->a[idxNew];
163768	164340	markTermAsChild(pWC, idxNew, idxTerm);
163769	164341	if( op==TK_IS ) pNew->wtFlags \|= TERM_IS;
163770	164342	pTerm = &pWC->a[idxTerm];
163771	164343	pTerm->wtFlags \|= TERM_COPIED;
163772		-
163773		- if( termIsEquivalence(pParse, pDup) ){
	164344	+ assert( pWInfo->pTabList!=0 );
	164345	+ if( termIsEquivalence(pParse, pDup, pWInfo->pTabList) ){
163774	164346	pTerm->eOperator \|= WO_EQUIV;
163775	164347	eExtraOp = WO_EQUIV;
163776	164348	}
163777	164349	}else{
163778	164350	pDup = pExpr;
		@@ -164074,11 +164646,11 @@
164074	164646	pNewExpr->w.iJoin = pExpr->w.iJoin;
164075	164647	}
164076	164648	idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL\|TERM_DYNAMIC);
164077	164649	testcase( idxNew==0 );
164078	164650	pNewTerm = &pWC->a[idxNew];
164079		- pNewTerm->prereqRight = prereqExpr;
	164651	+ pNewTerm->prereqRight = prereqExpr \| extraRight;
164080	164652	pNewTerm->leftCursor = pLeft->iTable;
164081	164653	pNewTerm->u.x.leftColumn = pLeft->iColumn;
164082	164654	pNewTerm->eOperator = WO_AUX;
164083	164655	pNewTerm->eMatchOp = eOp2;
164084	164656	markTermAsChild(pWC, idxNew, idxTerm);
		@@ -164185,11 +164757,11 @@
164185	164757	** SELECT statement passed as the second argument. These terms are only
164186	164758	** added if:
164187	164759	**
164188	164760	** 1. The SELECT statement has a LIMIT clause, and
164189	164761	** 2. The SELECT statement is not an aggregate or DISTINCT query, and
164190		-** 3. The SELECT statement has exactly one object in its from clause, and
	164762	+** 3. The SELECT statement has exactly one object in its FROM clause, and
164191	164763	** that object is a virtual table, and
164192	164764	** 4. There are no terms in the WHERE clause that will not be passed
164193	164765	** to the virtual table xBestIndex method.
164194	164766	** 5. The ORDER BY clause, if any, will be made available to the xBestIndex
164195	164767	** method.
		@@ -164222,12 +164794,26 @@
164222	164794	** pWC->a[] array. So this term can be ignored, as a LIMIT clause
164223	164795	** will only be added if each of the child terms passes the
164224	164796	** (leftCursor==iCsr) test below. */
164225	164797	continue;
164226	164798	}
164227		- if( pWC->a[ii].leftCursor!=iCsr ) return;
164228		- if( pWC->a[ii].prereqRight!=0 ) return;
	164799	+ if( pWC->a[ii].leftCursor==iCsr && pWC->a[ii].prereqRight==0 ) continue;
	164800	+
	164801	+ /* If this term has a parent with exactly one child, and the parent will
	164802	+ ** be passed through to xBestIndex, then this term can be ignored. */
	164803	+ if( pWC->a[ii].iParent>=0 ){
	164804	+ WhereTerm *pParent = &pWC->a[ pWC->a[ii].iParent ];
	164805	+ if( pParent->leftCursor==iCsr
	164806	+ && pParent->prereqRight==0
	164807	+ && pParent->nChild==1
	164808	+ ){
	164809	+ continue;
	164810	+ }
	164811	+ }
	164812	+
	164813	+ /* This term will not be passed through. Do not add a LIMIT clause. */
	164814	+ return;
164229	164815	}
164230	164816
164231	164817	/* Check condition (5). Return early if it is not met. */
164232	164818	if( pOrderBy ){
164233	164819	for(ii=0; ii<pOrderBy->nExpr; ii++){
		@@ -164887,15 +165473,15 @@
164887	165473	continue;
164888	165474	}
164889	165475	pScan->pWC = pWC;
164890	165476	pScan->k = k+1;
164891	165477	#ifdef WHERETRACE_ENABLED
164892		- if( sqlite3WhereTrace & 0x20000 ){
	165478	+ if( (sqlite3WhereTrace & 0x20000)!=0 && pScan->nEquiv>1 ){
164893	165479	int ii;
164894		- sqlite3DebugPrintf("SCAN-TERM %p: nEquiv=%d",
164895		- pTerm, pScan->nEquiv);
164896		- for(ii=0; ii<pScan->nEquiv; ii++){
	165480	+ sqlite3DebugPrintf("EQUIVALENT TO {%d:%d} (due to TERM-%d):",
	165481	+ pScan->aiCur[0], pScan->aiColumn[0], pTerm->iTerm);
	165482	+ for(ii=1; ii<pScan->nEquiv; ii++){
164897	165483	sqlite3DebugPrintf(" {%d:%d}",
164898	165484	pScan->aiCur[ii], pScan->aiColumn[ii]);
164899	165485	}
164900	165486	sqlite3DebugPrintf("\n");
164901	165487	}
		@@ -165662,11 +166248,13 @@
165662	166248	sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, pSubq->addrFillSub);
165663	166249	addrTop = sqlite3VdbeAddOp1(v, OP_Yield, regYield);
165664	166250	VdbeCoverage(v);
165665	166251	VdbeComment((v, "next row of %s", pSrc->pSTab->zName));
165666	166252	}else{
165667		- addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, pLevel->iTabCur); VdbeCoverage(v);
	166253	+ assert( pLevel->addrHalt );
	166254	+ addrTop = sqlite3VdbeAddOp2(v, OP_Rewind,pLevel->iTabCur,pLevel->addrHalt);
	166255	+ VdbeCoverage(v);
165668	166256	}
165669	166257	if( pPartial ){
165670	166258	iContinue = sqlite3VdbeMakeLabel(pParse);
165671	166259	sqlite3ExprIfFalse(pParse, pPartial, iContinue, SQLITE_JUMPIFNULL);
165672	166260	pLoop->wsFlags \|= WHERE_PARTIALIDX;
		@@ -165690,15 +166278,18 @@
165690	166278	assert( pLevel->iIdxCur>0 );
165691	166279	translateColumnToCopy(pParse, addrTop, pLevel->iTabCur,
165692	166280	pSrc->u4.pSubq->regResult, pLevel->iIdxCur);
165693	166281	sqlite3VdbeGoto(v, addrTop);
165694	166282	pSrc->fg.viaCoroutine = 0;
	166283	+ sqlite3VdbeJumpHere(v, addrTop);
165695	166284	}else{
165696	166285	sqlite3VdbeAddOp2(v, OP_Next, pLevel->iTabCur, addrTop+1); VdbeCoverage(v);
165697	166286	sqlite3VdbeChangeP5(v, SQLITE_STMTSTATUS_AUTOINDEX);
	166287	+ if( (pSrc->fg.jointype & JT_LEFT)!=0 ){
	166288	+ sqlite3VdbeJumpHere(v, addrTop);
	166289	+ }
165698	166290	}
165699		- sqlite3VdbeJumpHere(v, addrTop);
165700	166291	sqlite3ReleaseTempReg(pParse, regRecord);
165701	166292
165702	166293	/* Jump here when skipping the initialization */
165703	166294	sqlite3VdbeJumpHere(v, addrInit);
165704	166295	sqlite3VdbeScanStatusRange(v, addrExp, addrExp, -1);
		@@ -166846,10 +167437,11 @@
166846	167437	sqlite3_snprintf(sizeof(zLeft),zLeft,"indexable=0x%llx",
166847	167438	pTerm->u.pOrInfo->indexable);
166848	167439	}else{
166849	167440	sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor);
166850	167441	}
	167442	+ iTerm = pTerm->iTerm = MAX(iTerm,pTerm->iTerm);
166851	167443	sqlite3DebugPrintf(
166852	167444	"TERM-%-3d %p %s %-12s op=%03x wtFlags=%04x",
166853	167445	iTerm, pTerm, zType, zLeft, pTerm->eOperator, pTerm->wtFlags);
166854	167446	/* The 0x10000 .wheretrace flag causes extra information to be
166855	167447	** shown about each Term */
		@@ -167620,15 +168212,12 @@
167620	168212	opMask = WO_LT\|WO_LE;
167621	168213	}else{
167622	168214	assert( pNew->u.btree.nBtm==0 );
167623	168215	opMask = WO_EQ\|WO_IN\|WO_GT\|WO_GE\|WO_LT\|WO_LE\|WO_ISNULL\|WO_IS;
167624	168216	}
167625		- if( pProbe->bUnordered \|\| pProbe->bLowQual ){
167626		- if( pProbe->bUnordered ) opMask &= ~(WO_GT\|WO_GE\|WO_LT\|WO_LE);
167627		- if( pProbe->bLowQual && pSrc->fg.isIndexedBy==0 ){
167628		- opMask &= ~(WO_EQ\|WO_IN\|WO_IS);
167629		- }
	168217	+ if( pProbe->bUnordered ){
	168218	+ opMask &= ~(WO_GT\|WO_GE\|WO_LT\|WO_LE);
167630	168219	}
167631	168220
167632	168221	assert( pNew->u.btree.nEq<pProbe->nColumn );
167633	168222	assert( pNew->u.btree.nEq<pProbe->nKeyCol
167634	168223	\|\| pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY );
		@@ -167697,19 +168286,33 @@
167697	168286	if( eOp & WO_IN ){
167698	168287	Expr *pExpr = pTerm->pExpr;
167699	168288	if( ExprUseXSelect(pExpr) ){
167700	168289	/* "x IN (SELECT ...)": TUNING: the SELECT returns 25 rows */
167701	168290	int i;
	168291	+ int bRedundant = 0;
167702	168292	nIn = 46; assert( 46==sqlite3LogEst(25) );
167703	168293
167704	168294	/* The expression may actually be of the form (x, y) IN (SELECT...).
167705	168295	** In this case there is a separate term for each of (x) and (y).
167706	168296	** However, the nIn multiplier should only be applied once, not once
167707	168297	** for each such term. The following loop checks that pTerm is the
167708	168298	** first such term in use, and sets nIn back to 0 if it is not. */
167709	168299	for(i=0; i<pNew->nLTerm-1; i++){
167710		- if( pNew->aLTerm[i] && pNew->aLTerm[i]->pExpr==pExpr ) nIn = 0;
	168300	+ if( pNew->aLTerm[i] && pNew->aLTerm[i]->pExpr==pExpr ){
	168301	+ nIn = 0;
	168302	+ if( pNew->aLTerm[i]->u.x.iField == pTerm->u.x.iField ){
	168303	+ /* Detect when two or more columns of an index match the same
	168304	+ ** column of a vector IN operater, and avoid adding the column
	168305	+ ** to the WhereLoop more than once. See tag-20250707-01
	168306	+ ** in test/rowvalue.test */
	168307	+ bRedundant = 1;
	168308	+ }
	168309	+ }
	168310	+ }
	168311	+ if( bRedundant ){
	168312	+ pNew->nLTerm--;
	168313	+ continue;
167711	168314	}
167712	168315	}else if( ALWAYS(pExpr->x.pList && pExpr->x.pList->nExpr) ){
167713	168316	/* "x IN (value, value, ...)" */
167714	168317	nIn = sqlite3LogEst(pExpr->x.pList->nExpr);
167715	168318	}
		@@ -167937,11 +168540,11 @@
167937	168540	}
167938	168541
167939	168542	if( (pNew->wsFlags & WHERE_TOP_LIMIT)==0
167940	168543	&& pNew->u.btree.nEq<pProbe->nColumn
167941	168544	&& (pNew->u.btree.nEq<pProbe->nKeyCol \|\|
167942		- (pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY && !pProbe->bIdxRowid))
	168545	+ pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY)
167943	168546	){
167944	168547	if( pNew->u.btree.nEq>3 ){
167945	168548	sqlite3ProgressCheck(pParse);
167946	168549	}
167947	168550	whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nInMul+nIn);
		@@ -167976,10 +168579,11 @@
167976	168579	&& saved_nEq==pNew->nLTerm
167977	168580	&& pProbe->noSkipScan==0
167978	168581	&& pProbe->hasStat1!=0
167979	168582	&& OptimizationEnabled(db, SQLITE_SkipScan)
167980	168583	&& pProbe->aiRowLogEst[saved_nEq+1]>=42 /* TUNING: Minimum for skip-scan */
	168584	+ && pSrc->fg.fromExists==0
167981	168585	&& (rc = whereLoopResize(db, pNew, pNew->nLTerm+1))==SQLITE_OK
167982	168586	){
167983	168587	LogEst nIter;
167984	168588	pNew->u.btree.nEq++;
167985	168589	pNew->nSkip++;
		@@ -168066,10 +168670,11 @@
168066	168670	Expr *pExpr;
168067	168671	pExpr = pTerm->pExpr;
168068	168672	if( (!ExprHasProperty(pExpr, EP_OuterON) \|\| pExpr->w.iJoin==iTab)
168069	168673	&& ((jointype & JT_OUTER)==0 \|\| ExprHasProperty(pExpr, EP_OuterON))
168070	168674	&& sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, iTab)
	168675	+ && !sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, -1)
168071	168676	&& (pTerm->wtFlags & TERM_VNULL)==0
168072	168677	){
168073	168678	return 1;
168074	168679	}
168075	168680	}
		@@ -168561,11 +169166,11 @@
168561	169166	}
168562	169167	}else if( m==0
168563	169168	&& (HasRowid(pTab) \|\| pWInfo->pSelect!=0 \|\| sqlite3FaultSim(700))
168564	169169	){
168565	169170	WHERETRACE(0x200,
168566		- ("-> %s a covering index according to bitmasks\n",
	169171	+ ("-> %s is a covering index according to bitmasks\n",
168567	169172	pProbe->zName, m==0 ? "is" : "is not"));
168568	169173	pNew->wsFlags = WHERE_IDX_ONLY \| WHERE_INDEXED;
168569	169174	}
168570	169175	}
168571	169176
		@@ -171532,10 +172137,18 @@
171532	172137
171533	172138	pTabItem = &pTabList->a[pLevel->iFrom];
171534	172139	pTab = pTabItem->pSTab;
171535	172140	iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
171536	172141	pLoop = pLevel->pWLoop;
	172142	+ pLevel->addrBrk = sqlite3VdbeMakeLabel(pParse);
	172143	+ if( ii==0 \|\| (pTabItem[0].fg.jointype & JT_LEFT)!=0 ){
	172144	+ pLevel->addrHalt = pLevel->addrBrk;
	172145	+ }else if( pWInfo->a[ii-1].pRJ ){
	172146	+ pLevel->addrHalt = pWInfo->a[ii-1].addrBrk;
	172147	+ }else{
	172148	+ pLevel->addrHalt = pWInfo->a[ii-1].addrHalt;
	172149	+ }
171537	172150	if( (pTab->tabFlags & TF_Ephemeral)!=0 \|\| IsView(pTab) ){
171538	172151	/* Do nothing */
171539	172152	}else
171540	172153	#ifndef SQLITE_OMIT_VIRTUALTABLE
171541	172154	if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 ){
		@@ -171583,10 +172196,17 @@
171583	172196	}
171584	172197	#ifdef SQLITE_ENABLE_COLUMN_USED_MASK
171585	172198	sqlite3VdbeAddOp4Dup8(v, OP_ColumnsUsed, pTabItem->iCursor, 0, 0,
171586	172199	(const u8*)&pTabItem->colUsed, P4_INT64);
171587	172200	#endif
	172201	+ if( ii>=2
	172202	+ && (pTabItem[0].fg.jointype & (JT_LTORJ\|JT_LEFT))==0
	172203	+ && pLevel->addrHalt==pWInfo->a[0].addrHalt
	172204	+ ){
	172205	+ sqlite3VdbeAddOp2(v, OP_IfEmpty, pTabItem->iCursor, pWInfo->iBreak);
	172206	+ VdbeCoverage(v);
	172207	+ }
171588	172208	}else{
171589	172209	sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
171590	172210	}
171591	172211	if( pLoop->wsFlags & WHERE_INDEXED ){
171592	172212	Index *pIx = pLoop->u.btree.pIndex;
		@@ -171839,10 +172459,13 @@
171839	172459	VdbeCoverageIf(v, op==OP_SeekLT);
171840	172460	VdbeCoverageIf(v, op==OP_SeekGT);
171841	172461	sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2);
171842	172462	}
171843	172463	#endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */
	172464	+ if( pTabList->a[pLevel->iFrom].fg.fromExists ){
	172465	+ sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
	172466	+ }
171844	172467	/* The common case: Advance to the next row */
171845	172468	if( pLevel->addrCont ) sqlite3VdbeResolveLabel(v, pLevel->addrCont);
171846	172469	sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
171847	172470	sqlite3VdbeChangeP5(v, pLevel->p5);
171848	172471	VdbeCoverage(v);
		@@ -179911,16 +180534,25 @@
179911	180534	/* Expressions of the form
179912	180535	**
179913	180536	** expr1 IN ()
179914	180537	** expr1 NOT IN ()
179915	180538	**
179916		- ** simplify to constants 0 (false) and 1 (true), respectively,
179917		- ** regardless of the value of expr1.
	180539	+ ** simplify to constants 0 (false) and 1 (true), respectively.
	180540	+ **
	180541	+ ** Except, do not apply this optimization if expr1 contains a function
	180542	+ ** because that function might be an aggregate (we don't know yet whether
	180543	+ ** it is or not) and if it is an aggregate, that could change the meaning
	180544	+ ** of the whole query.
179918	180545	*/
179919		- sqlite3ExprUnmapAndDelete(pParse, yymsp[-4].minor.yy590);
179920		- yymsp[-4].minor.yy590 = sqlite3Expr(pParse->db, TK_STRING, yymsp[-3].minor.yy502 ? "true" : "false");
179921		- if( yymsp[-4].minor.yy590 ) sqlite3ExprIdToTrueFalse(yymsp[-4].minor.yy590);
	180546	+ Expr *pB = sqlite3Expr(pParse->db, TK_STRING, yymsp[-3].minor.yy502 ? "true" : "false");
	180547	+ if( pB ) sqlite3ExprIdToTrueFalse(pB);
	180548	+ if( !ExprHasProperty(yymsp[-4].minor.yy590, EP_HasFunc) ){
	180549	+ sqlite3ExprUnmapAndDelete(pParse, yymsp[-4].minor.yy590);
	180550	+ yymsp[-4].minor.yy590 = pB;
	180551	+ }else{
	180552	+ yymsp[-4].minor.yy590 = sqlite3PExpr(pParse, yymsp[-3].minor.yy502 ? TK_OR : TK_AND, pB, yymsp[-4].minor.yy590);
	180553	+ }
179922	180554	}else{
179923	180555	Expr *pRHS = yymsp[-1].minor.yy402->a[0].pExpr;
179924	180556	if( yymsp[-1].minor.yy402->nExpr==1 && sqlite3ExprIsConstant(pParse,pRHS) && yymsp[-4].minor.yy590->op!=TK_VECTOR ){
179925	180557	yymsp[-1].minor.yy402->a[0].pExpr = 0;
179926	180558	sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy402);
		@@ -181522,11 +182154,11 @@
181522	182154	static int getToken(const unsigned char **pz){
181523	182155	const unsigned char z = pz;
181524	182156	int t; /* Token type to return */
181525	182157	do {
181526	182158	z += sqlite3GetToken(z, &t);
181527		- }while( t==TK_SPACE );
	182159	+ }while( t==TK_SPACE \|\| t==TK_COMMENT );
181528	182160	if( t==TK_ID
181529	182161	\|\| t==TK_STRING
181530	182162	\|\| t==TK_JOIN_KW
181531	182163	\|\| t==TK_WINDOW
181532	182164	\|\| t==TK_OVER
		@@ -184472,10 +185104,11 @@
184472	185104	#ifdef SQLITE_ENABLE_API_ARMOR
184473	185105	if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
184474	185106	#endif
184475	185107	if( ms<-1 ) return SQLITE_RANGE;
184476	185108	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
	185109	+ sqlite3_mutex_enter(db->mutex);
184477	185110	db->setlkTimeout = ms;
184478	185111	db->setlkFlags = flags;
184479	185112	sqlite3BtreeEnterAll(db);
184480	185113	for(iDb=0; iDb<db->nDb; iDb++){
184481	185114	Btree *pBt = db->aDb[iDb].pBt;
		@@ -184483,10 +185116,11 @@
184483	185116	sqlite3_file *fd = sqlite3PagerFile(sqlite3BtreePager(pBt));
184484	185117	sqlite3OsFileControlHint(fd, SQLITE_FCNTL_BLOCK_ON_CONNECT, (void*)&bBOC);
184485	185118	}
184486	185119	}
184487	185120	sqlite3BtreeLeaveAll(db);
	185121	+ sqlite3_mutex_leave(db->mutex);
184488	185122	#endif
184489	185123	#if !defined(SQLITE_ENABLE_API_ARMOR) && !defined(SQLITE_ENABLE_SETLK_TIMEOUT)
184490	185124	UNUSED_PARAMETER(db);
184491	185125	UNUSED_PARAMETER(flags);
184492	185126	#endif
		@@ -188869,11 +189503,11 @@
188869	189503
188870	189504	/*
188871	189505	** Macros needed to provide flexible arrays in a portable way
188872	189506	*/
188873	189507	#ifndef offsetof
188874		-# define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
	189508	+# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
188875	189509	#endif
188876	189510	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
188877	189511	# define FLEXARRAY
188878	189512	#else
188879	189513	# define FLEXARRAY 1
		@@ -207968,60 +208602,113 @@
207968	208602	** Growing our own isspace() routine this way is twice as fast as
207969	208603	** the library isspace() function, resulting in a 7% overall performance
207970	208604	** increase for the text-JSON parser. (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
207971	208605	*/
207972	208606	static const char jsonIsSpace[] = {
207973		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0,
207974		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207975		- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207976		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207977		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207978		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207979		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207980		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207981		-
207982		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207983		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207984		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207985		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207986		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207987		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207988		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207989		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	208607	+#ifdef SQLITE_ASCII
	208608	+/0 1 2 3 4 5 6 7 8 9 a b c d e f /
	208609	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0 */
	208610	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
	208611	+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2 */
	208612	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 3 */
	208613	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 4 */
	208614	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 5 */
	208615	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 6 */
	208616	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 7 */
	208617	+
	208618	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 8 */
	208619	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9 */
	208620	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* a */
	208621	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* b */
	208622	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* c */
	208623	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* d */
	208624	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* e */
	208625	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* f */
	208626	+#endif
	208627	+#ifdef SQLITE_EBCDIC
	208628	+/0 1 2 3 4 5 6 7 8 9 a b c d e f /
	208629	+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, /* 0 */
	208630	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
	208631	+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2 */
	208632	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 3 */
	208633	+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 4 */
	208634	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 5 */
	208635	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 6 */
	208636	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 7 */
	208637	+
	208638	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 8 */
	208639	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9 */
	208640	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* a */
	208641	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* b */
	208642	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* c */
	208643	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* d */
	208644	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* e */
	208645	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* f */
	208646	+#endif
	208647	+
207990	208648	};
207991	208649	#define jsonIsspace(x) (jsonIsSpace[(unsigned char)x])
207992	208650
207993	208651	/*
207994	208652	** The set of all space characters recognized by jsonIsspace().
207995	208653	** Useful as the second argument to strspn().
207996	208654	*/
	208655	+#ifdef SQLITE_ASCII
207997	208656	static const char jsonSpaces[] = "\011\012\015\040";
	208657	+#endif
	208658	+#ifdef SQLITE_EBCDIC
	208659	+static const char jsonSpaces[] = "\005\045\015\100";
	208660	+#endif
	208661	+
207998	208662
207999	208663	/*
208000	208664	** Characters that are special to JSON. Control characters,
208001	208665	** '"' and '\\' and '\''. Actually, '\'' is not special to
208002	208666	** canonical JSON, but it is special in JSON-5, so we include
208003	208667	** it in the set of special characters.
208004	208668	*/
208005	208669	static const char jsonIsOk[256] = {
208006		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
208007		- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
208008		- 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
208009		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208010		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208011		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
208012		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208013		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208014		-
208015		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208016		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208017		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208018		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208019		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208020		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208021		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208022		- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
	208670	+#ifdef SQLITE_ASCII
	208671	+/0 1 2 3 4 5 6 7 8 9 a b c d e f /
	208672	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0 */
	208673	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
	208674	+ 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, /* 2 */
	208675	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 3 */
	208676	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4 */
	208677	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, /* 5 */
	208678	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6 */
	208679	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 7 */
	208680	+
	208681	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 8 */
	208682	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 9 */
	208683	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* a */
	208684	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* b */
	208685	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* c */
	208686	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* d */
	208687	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* e */
	208688	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* f */
	208689	+#endif
	208690	+#ifdef SQLITE_EBCDIC
	208691	+/0 1 2 3 4 5 6 7 8 9 a b c d e f /
	208692	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0 */
	208693	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
	208694	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2 */
	208695	+ 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, /* 3 */
	208696	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4 */
	208697	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 5 */
	208698	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6 */
	208699	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, /* 7 */
	208700	+
	208701	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 8 */
	208702	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 9 */
	208703	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* a */
	208704	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* b */
	208705	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* c */
	208706	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* d */
	208707	+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* e */
	208708	+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* f */
	208709	+#endif
208023	208710	};
208024	208711
208025	208712	/* Objects */
208026	208713	typedef struct JsonCache JsonCache;
208027	208714	typedef struct JsonString JsonString;
		@@ -208162,11 +208849,11 @@
208162	208849
208163	208850	/**************************************************************************
208164	208851	** Forward references
208165	208852	**************************************************************************/
208166	208853	static void jsonReturnStringAsBlob(JsonString*);
208167		-static int jsonFuncArgMightBeBinary(sqlite3_value *pJson);
	208854	+static int jsonArgIsJsonb(sqlite3_value pJson, JsonParse p);
208168	208855	static u32 jsonTranslateBlobToText(const JsonParse,u32,JsonString);
208169	208856	static void jsonReturnParse(sqlite3_context,JsonParse);
208170	208857	static JsonParse jsonParseFuncArg(sqlite3_context,sqlite3_value*,u32);
208171	208858	static void jsonParseFree(JsonParse*);
208172	208859	static u32 jsonbPayloadSize(const JsonParse, u32, u32);
		@@ -208580,15 +209267,13 @@
208580	209267	jsonAppendString(p, z, n);
208581	209268	}
208582	209269	break;
208583	209270	}
208584	209271	default: {
208585		- if( jsonFuncArgMightBeBinary(pValue) ){
208586		- JsonParse px;
208587		- memset(&px, 0, sizeof(px));
208588		- px.aBlob = (u8*)sqlite3_value_blob(pValue);
208589		- px.nBlob = sqlite3_value_bytes(pValue);
	209272	+ JsonParse px;
	209273	+ memset(&px, 0, sizeof(px));
	209274	+ if( jsonArgIsJsonb(pValue, &px) ){
208590	209275	jsonTranslateBlobToText(&px, 0, p);
208591	209276	}else if( p->eErr==0 ){
208592	209277	sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1);
208593	209278	p->eErr = JSTRING_ERR;
208594	209279	jsonStringReset(p);
		@@ -209051,12 +209736,14 @@
209051	209736	nExtra = 0;
209052	209737	}else if( szType==12 ){
209053	209738	nExtra = 1;
209054	209739	}else if( szType==13 ){
209055	209740	nExtra = 2;
209056		- }else{
	209741	+ }else if( szType==14 ){
209057	209742	nExtra = 4;
	209743	+ }else{
	209744	+ nExtra = 8;
209058	209745	}
209059	209746	if( szPayload<=11 ){
209060	209747	nNeeded = 0;
209061	209748	}else if( szPayload<=0xff ){
209062	209749	nNeeded = 1;
		@@ -209522,11 +210209,16 @@
209522	210209	c = z[++j];
209523	210210	if( c=='"' \|\| c=='\\' \|\| c=='/' \|\| c=='b' \|\| c=='f'
209524	210211	\|\| c=='n' \|\| c=='r' \|\| c=='t'
209525	210212	\|\| (c=='u' && jsonIs4Hex(&z[j+1])) ){
209526	210213	if( opcode==JSONB_TEXT ) opcode = JSONB_TEXTJ;
209527		- }else if( c=='\'' \|\| c=='0' \|\| c=='v' \|\| c=='\n'
	210214	+ }else if( c=='\'' \|\| c=='v' \|\| c=='\n'
	210215	+#ifdef SQLITE_BUG_COMPATIBLE_20250510
	210216	+ \|\| (c=='0') /* Legacy bug compatible */
	210217	+#else
	210218	+ \|\| (c=='0' && !sqlite3Isdigit(z[j+1])) /* Correct implementation */
	210219	+#endif
209528	210220	\|\| (0xe2==(u8)c && 0x80==(u8)z[j+1]
209529	210221	&& (0xa8==(u8)z[j+2] \|\| 0xa9==(u8)z[j+2]))
209530	210222	\|\| (c=='x' && jsonIs2Hex(&z[j+1])) ){
209531	210223	opcode = JSONB_TEXT5;
209532	210224	pParse->hasNonstd = 1;
		@@ -209909,11 +210601,11 @@
209909	210601	\|\| pParse->aBlob[i+4]!=0
209910	210602	){
209911	210603	*pSz = 0;
209912	210604	return 0;
209913	210605	}
209914		- sz = (pParse->aBlob[i+5]<<24) + (pParse->aBlob[i+6]<<16) +
	210606	+ sz = ((u32)pParse->aBlob[i+5]<<24) + (pParse->aBlob[i+6]<<16) +
209915	210607	(pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8];
209916	210608	n = 9;
209917	210609	}
209918	210610	if( (i64)i+sz+n > pParse->nBlob
209919	210611	&& (i64)i+sz+n > pParse->nBlob-pParse->delta
		@@ -210258,37 +210950,10 @@
210258	210950	}
210259	210951	}
210260	210952	return i;
210261	210953	}
210262	210954
210263		-
210264		-/* Return true if the input pJson
210265		-**
210266		-** For performance reasons, this routine does not do a detailed check of the
210267		-** input BLOB to ensure that it is well-formed. Hence, false positives are
210268		-** possible. False negatives should never occur, however.
210269		-*/
210270		-static int jsonFuncArgMightBeBinary(sqlite3_value *pJson){
210271		- u32 sz, n;
210272		- const u8 *aBlob;
210273		- int nBlob;
210274		- JsonParse s;
210275		- if( sqlite3_value_type(pJson)!=SQLITE_BLOB ) return 0;
210276		- aBlob = sqlite3_value_blob(pJson);
210277		- nBlob = sqlite3_value_bytes(pJson);
210278		- if( nBlob<1 ) return 0;
210279		- if( NEVER(aBlob==0) \|\| (aBlob[0] & 0x0f)>JSONB_OBJECT ) return 0;
210280		- memset(&s, 0, sizeof(s));
210281		- s.aBlob = (u8*)aBlob;
210282		- s.nBlob = nBlob;
210283		- n = jsonbPayloadSize(&s, 0, &sz);
210284		- if( n==0 ) return 0;
210285		- if( sz+n!=(u32)nBlob ) return 0;
210286		- if( (aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0 ) return 0;
210287		- return sz+n==(u32)nBlob;
210288		-}
210289		-
210290	210955	/*
210291	210956	** Given that a JSONB_ARRAY object starts at offset i, return
210292	210957	** the number of entries in that array.
210293	210958	*/
210294	210959	static u32 jsonbArrayCount(JsonParse *pParse, u32 iRoot){
		@@ -210517,11 +211182,25 @@
210517	211182	case 'f': { *piOut = '\f'; return 2; }
210518	211183	case 'n': { *piOut = '\n'; return 2; }
210519	211184	case 'r': { *piOut = '\r'; return 2; }
210520	211185	case 't': { *piOut = '\t'; return 2; }
210521	211186	case 'v': { *piOut = '\v'; return 2; }
210522		- case '0': { *piOut = 0; return 2; }
	211187	+ case '0': {
	211188	+ /* JSON5 requires that the \0 escape not be followed by a digit.
	211189	+ ** But SQLite did not enforce this restriction in versions 3.42.0
	211190	+ ** through 3.49.2. That was a bug. But some applications might have
	211191	+ ** come to depend on that bug. Use the SQLITE_BUG_COMPATIBLE_20250510
	211192	+ ** option to restore the old buggy behavior. */
	211193	+#ifdef SQLITE_BUG_COMPATIBLE_20250510
	211194	+ /* Legacy bug-compatible behavior */
	211195	+ *piOut = 0;
	211196	+#else
	211197	+ /* Correct behavior */
	211198	+ *piOut = (n>2 && sqlite3Isdigit(z[2])) ? JSON_INVALID_CHAR : 0;
	211199	+#endif
	211200	+ return 2;
	211201	+ }
210523	211202	case '\'':
210524	211203	case '"':
210525	211204	case '/':
210526	211205	case '\\':{ *piOut = z[1]; return 2; }
210527	211206	case 'x': {
		@@ -211112,14 +211791,11 @@
211112	211791	pParse->aBlob = aNull;
211113	211792	pParse->nBlob = 1;
211114	211793	return 0;
211115	211794	}
211116	211795	case SQLITE_BLOB: {
211117		- if( jsonFuncArgMightBeBinary(pArg) ){
211118		- pParse->aBlob = (u8*)sqlite3_value_blob(pArg);
211119		- pParse->nBlob = sqlite3_value_bytes(pArg);
211120		- }else{
	211796	+ if( !jsonArgIsJsonb(pArg, pParse) ){
211121	211797	sqlite3_result_error(ctx, "JSON cannot hold BLOB values", -1);
211122	211798	return 1;
211123	211799	}
211124	211800	break;
211125	211801	}
		@@ -211266,31 +211942,50 @@
211266	211942	}
211267	211943
211268	211944	/*
211269	211945	** If pArg is a blob that seems like a JSONB blob, then initialize
211270	211946	** p to point to that JSONB and return TRUE. If pArg does not seem like
211271		-** a JSONB blob, then return FALSE;
	211947	+** a JSONB blob, then return FALSE.
211272	211948	**
211273		-** This routine is only called if it is already known that pArg is a
211274		-** blob. The only open question is whether or not the blob appears
211275		-** to be a JSONB blob.
	211949	+** For small BLOBs (having no more than 7 bytes of payload) a full
	211950	+** validity check is done. So for small BLOBs this routine only returns
	211951	+** true if the value is guaranteed to be a valid JSONB. For larger BLOBs
	211952	+** (8 byte or more of payload) only the size of the outermost element is
	211953	+** checked to verify that the BLOB is superficially valid JSONB.
	211954	+**
	211955	+** A full JSONB validation is done on smaller BLOBs because those BLOBs might
	211956	+** also be text JSON that has been incorrectly cast into a BLOB.
	211957	+** (See tag-20240123-a and https://sqlite.org/forum/forumpost/012136abd5)
	211958	+** If the BLOB is 9 bytes are larger, then it is not possible for the
	211959	+** superficial size check done here to pass if the input is really text
	211960	+** JSON so we do not need to look deeper in that case.
	211961	+**
	211962	+** Why we only need to do full JSONB validation for smaller BLOBs:
	211963	+**
	211964	+** The first byte of valid JSON text must be one of: '{', '[', '"', ' ', '\n',
	211965	+** '\r', '\t', '-', or a digit '0' through '9'. Of these, only a subset
	211966	+** can also be the first byte of JSONB: '{', '[', and digits '3'
	211967	+** through '9'. In every one of those cases, the payload size is 7 bytes
	211968	+** or less. So if we do full JSONB validation for every BLOB where the
	211969	+** payload is less than 7 bytes, we will never get a false positive for
	211970	+** JSONB on an input that is really text JSON.
211276	211971	*/
211277	211972	static int jsonArgIsJsonb(sqlite3_value pArg, JsonParse p){
211278	211973	u32 n, sz = 0;
	211974	+ u8 c;
	211975	+ if( sqlite3_value_type(pArg)!=SQLITE_BLOB ) return 0;
211279	211976	p->aBlob = (u8*)sqlite3_value_blob(pArg);
211280	211977	p->nBlob = (u32)sqlite3_value_bytes(pArg);
211281		- if( p->nBlob==0 ){
211282		- p->aBlob = 0;
211283		- return 0;
211284		- }
211285		- if( NEVER(p->aBlob==0) ){
211286		- return 0;
211287		- }
211288		- if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT
	211978	+ if( p->nBlob>0
	211979	+ && ALWAYS(p->aBlob!=0)
	211980	+ && ((c = p->aBlob[0]) & 0x0f)<=JSONB_OBJECT
211289	211981	&& (n = jsonbPayloadSize(p, 0, &sz))>0
211290	211982	&& sz+n==p->nBlob
211291		- && ((p->aBlob[0] & 0x0f)>JSONB_FALSE \|\| sz==0)
	211983	+ && ((c & 0x0f)>JSONB_FALSE \|\| sz==0)
	211984	+ && (sz>7
	211985	+ \|\| (c!=0x7b && c!=0x5b && !sqlite3Isdigit(c))
	211986	+ \|\| jsonbValidityCheck(p, 0, p->nBlob, 1)==0)
211292	211987	){
211293	211988	return 1;
211294	211989	}
211295	211990	p->aBlob = 0;
211296	211991	p->nBlob = 0;
		@@ -212379,25 +213074,21 @@
212379	213074	sqlite3_result_int(ctx, 0);
212380	213075	#endif
212381	213076	return;
212382	213077	}
212383	213078	case SQLITE_BLOB: {
212384		- if( jsonFuncArgMightBeBinary(argv[0]) ){
	213079	+ JsonParse py;
	213080	+ memset(&py, 0, sizeof(py));
	213081	+ if( jsonArgIsJsonb(argv[0], &py) ){
212385	213082	if( flags & 0x04 ){
212386	213083	/* Superficial checking only - accomplished by the
212387		- ** jsonFuncArgMightBeBinary() call above. */
	213084	+ ** jsonArgIsJsonb() call above. */
212388	213085	res = 1;
212389	213086	}else if( flags & 0x08 ){
212390	213087	/* Strict checking. Check by translating BLOB->TEXT->BLOB. If
212391	213088	** no errors occur, call that a "strict check". */
212392		- JsonParse px;
212393		- u32 iErr;
212394		- memset(&px, 0, sizeof(px));
212395		- px.aBlob = (u8*)sqlite3_value_blob(argv[0]);
212396		- px.nBlob = sqlite3_value_bytes(argv[0]);
212397		- iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1);
212398		- res = iErr==0;
	213089	+ res = 0==jsonbValidityCheck(&py, 0, py.nBlob, 1);
212399	213090	}
212400	213091	break;
212401	213092	}
212402	213093	/* Fall through into interpreting the input as text. See note
212403	213094	** above at tag-20240123-a. */
		@@ -212451,13 +213142,11 @@
212451	213142
212452	213143	assert( argc==1 );
212453	213144	UNUSED_PARAMETER(argc);
212454	213145	memset(&s, 0, sizeof(s));
212455	213146	s.db = sqlite3_context_db_handle(ctx);
212456		- if( jsonFuncArgMightBeBinary(argv[0]) ){
212457		- s.aBlob = (u8*)sqlite3_value_blob(argv[0]);
212458		- s.nBlob = sqlite3_value_bytes(argv[0]);
	213147	+ if( jsonArgIsJsonb(argv[0], &s) ){
212459	213148	iErrPos = (i64)jsonbValidityCheck(&s, 0, s.nBlob, 1);
212460	213149	}else{
212461	213150	s.zJson = (char*)sqlite3_value_text(argv[0]);
212462	213151	if( s.zJson==0 ) return; /* NULL input or OOM */
212463	213152	s.nJson = sqlite3_value_bytes(argv[0]);
		@@ -212614,22 +213303,24 @@
212614	213303	const char *z;
212615	213304	u32 n;
212616	213305	UNUSED_PARAMETER(argc);
212617	213306	pStr = (JsonString)sqlite3_aggregate_context(ctx, sizeof(pStr));
212618	213307	if( pStr ){
	213308	+ z = (const char*)sqlite3_value_text(argv[0]);
	213309	+ n = sqlite3Strlen30(z);
212619	213310	if( pStr->zBuf==0 ){
212620	213311	jsonStringInit(pStr, ctx);
212621	213312	jsonAppendChar(pStr, '{');
212622		- }else if( pStr->nUsed>1 ){
	213313	+ }else if( pStr->nUsed>1 && z!=0 ){
212623	213314	jsonAppendChar(pStr, ',');
212624	213315	}
212625	213316	pStr->pCtx = ctx;
212626		- z = (const char*)sqlite3_value_text(argv[0]);
212627		- n = sqlite3Strlen30(z);
212628		- jsonAppendString(pStr, z, n);
212629		- jsonAppendChar(pStr, ':');
212630		- jsonAppendSqlValue(pStr, argv[1]);
	213317	+ if( z!=0 ){
	213318	+ jsonAppendString(pStr, z, n);
	213319	+ jsonAppendChar(pStr, ':');
	213320	+ jsonAppendSqlValue(pStr, argv[1]);
	213321	+ }
212631	213322	}
212632	213323	}
212633	213324	static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
212634	213325	JsonString *pStr;
212635	213326	pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
		@@ -213138,13 +213829,12 @@
213138	213829	jsonEachCursorReset(p);
213139	213830	if( idxNum==0 ) return SQLITE_OK;
213140	213831	memset(&p->sParse, 0, sizeof(p->sParse));
213141	213832	p->sParse.nJPRef = 1;
213142	213833	p->sParse.db = p->db;
213143		- if( jsonFuncArgMightBeBinary(argv[0]) ){
213144		- p->sParse.nBlob = sqlite3_value_bytes(argv[0]);
213145		- p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]);
	213834	+ if( jsonArgIsJsonb(argv[0], &p->sParse) ){
	213835	+ /* We have JSONB */
213146	213836	}else{
213147	213837	p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
213148	213838	p->sParse.nJson = sqlite3_value_bytes(argv[0]);
213149	213839	if( p->sParse.zJson==0 ){
213150	213840	p->i = p->iEnd = 0;
		@@ -213434,10 +214124,12 @@
213434	214124	#else
213435	214125	/* #include "sqlite3.h" */
213436	214126	#endif
213437	214127	SQLITE_PRIVATE int sqlite3GetToken(const unsigned char,int); /* In the SQLite core */
213438	214128
	214129	+/* #include <stddef.h> */
	214130	+
213439	214131	/*
213440	214132	** If building separately, we will need some setup that is normally
213441	214133	** found in sqliteInt.h
213442	214134	*/
213443	214135	#if !defined(SQLITE_AMALGAMATION)
		@@ -213465,11 +214157,11 @@
213465	214157	#else
213466	214158	# define ALWAYS(X) (X)
213467	214159	# define NEVER(X) (X)
213468	214160	#endif
213469	214161	#ifndef offsetof
213470		-#define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
	214162	+# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
213471	214163	#endif
213472	214164	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
213473	214165	# define FLEXARRAY
213474	214166	#else
213475	214167	# define FLEXARRAY 1
		@@ -214503,10 +215195,16 @@
214503	215195	pStmt = pCsr->pReadAux;
214504	215196	memset(pCsr, 0, sizeof(RtreeCursor));
214505	215197	pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
214506	215198	pCsr->pReadAux = pStmt;
214507	215199
	215200	+ /* The following will only fail if the previous sqlite3_step() call failed,
	215201	+ ** in which case the error has already been caught. This statement never
	215202	+ ** encounters an error within an sqlite3_column_xxx() function, as it
	215203	+ ** calls sqlite3_column_value(), which does not use malloc(). So it is safe
	215204	+ ** to ignore the error code here. */
	215205	+ sqlite3_reset(pStmt);
214508	215206	}
214509	215207
214510	215208	/*
214511	215209	** Rtree virtual table module xClose method.
214512	215210	*/
		@@ -227782,11 +228480,12 @@
227782	228480	DbpageTable pTab = (DbpageTable )pCursor->pVtab;
227783	228481	int rc;
227784	228482	sqlite3 *db = pTab->db;
227785	228483	Btree *pBt;
227786	228484
227787		- (void)idxStr;
	228485	+ UNUSED_PARAMETER(idxStr);
	228486	+ UNUSED_PARAMETER(argc);
227788	228487
227789	228488	/* Default setting is no rows of result */
227790	228489	pCsr->pgno = 1;
227791	228490	pCsr->mxPgno = 0;
227792	228491
		@@ -231444,18 +232143,19 @@
231444	232143	/*
231445	232144	** If the SessionInput object passed as the only argument is a streaming
231446	232145	** object and the buffer is full, discard some data to free up space.
231447	232146	*/
231448	232147	static void sessionDiscardData(SessionInput *pIn){
231449		- if( pIn->xInput && pIn->iNext>=sessions_strm_chunk_size ){
231450		- int nMove = pIn->buf.nBuf - pIn->iNext;
	232148	+ if( pIn->xInput && pIn->iCurrent>=sessions_strm_chunk_size ){
	232149	+ int nMove = pIn->buf.nBuf - pIn->iCurrent;
231451	232150	assert( nMove>=0 );
231452	232151	if( nMove>0 ){
231453		- memmove(pIn->buf.aBuf, &pIn->buf.aBuf[pIn->iNext], nMove);
	232152	+ memmove(pIn->buf.aBuf, &pIn->buf.aBuf[pIn->iCurrent], nMove);
231454	232153	}
231455		- pIn->buf.nBuf -= pIn->iNext;
231456		- pIn->iNext = 0;
	232154	+ pIn->buf.nBuf -= pIn->iCurrent;
	232155	+ pIn->iNext -= pIn->iCurrent;
	232156	+ pIn->iCurrent = 0;
231457	232157	pIn->nData = pIn->buf.nBuf;
231458	232158	}
231459	232159	}
231460	232160
231461	232161	/*
		@@ -231805,12 +232505,12 @@
231805	232505	** sufficient either for the 'T' or 'P' byte and the varint that follows
231806	232506	** it, or for the two single byte values otherwise. */
231807	232507	p->rc = sessionInputBuffer(&p->in, 2);
231808	232508	if( p->rc!=SQLITE_OK ) return p->rc;
231809	232509
231810		- sessionDiscardData(&p->in);
231811	232510	p->in.iCurrent = p->in.iNext;
	232511	+ sessionDiscardData(&p->in);
231812	232512
231813	232513	/* If the iterator is already at the end of the changeset, return DONE. */
231814	232514	if( p->in.iNext>=p->in.nData ){
231815	232515	return SQLITE_DONE;
231816	232516	}
		@@ -233229,10 +233929,14 @@
233229	233929	sqlite3_changeset_iter pIter, / Changeset to apply */
233230	233930	int(*xFilter)(
233231	233931	void pCtx, / Copy of sixth arg to _apply() */
233232	233932	const char zTab / Table name */
233233	233933	),
	233934	+ int(*xFilterIter)(
	233935	+ void pCtx, / Copy of sixth arg to _apply() */
	233936	+ sqlite3_changeset_iter *p
	233937	+ ),
233234	233938	int(*xConflict)(
233235	233939	void pCtx, / Copy of fifth arg to _apply() */
233236	233940	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233237	233941	sqlite3_changeset_iter p / Handle describing change and conflict */
233238	233942	),
		@@ -233368,10 +234072,13 @@
233368	234072	}
233369	234073
233370	234074	/* If there is a schema mismatch on the current table, proceed to the
233371	234075	** next change. A log message has already been issued. */
233372	234076	if( schemaMismatch ) continue;
	234077	+
	234078	+ /* If this is a call to apply_v3(), invoke xFilterIter here. */
	234079	+ if( xFilterIter && 0==xFilterIter(pCtx, pIter) ) continue;
233373	234080
233374	234081	rc = sessionApplyOneWithRetry(db, pIter, &sApply, xConflict, pCtx);
233375	234082	}
233376	234083
233377	234084	bPatchset = pIter->bPatchset;
		@@ -233435,10 +234142,91 @@
233435	234142	db->aDb[0].pSchema->schema_cookie -= 32;
233436	234143	}
233437	234144	sqlite3_mutex_leave(sqlite3_db_mutex(db));
233438	234145	return rc;
233439	234146	}
	234147	+
	234148	+/*
	234149	+** This function is called by all six sqlite3changeset_apply() variants:
	234150	+**
	234151	+** + sqlite3changeset_apply()
	234152	+** + sqlite3changeset_apply_v2()
	234153	+** + sqlite3changeset_apply_v3()
	234154	+** + sqlite3changeset_apply_strm()
	234155	+** + sqlite3changeset_apply_strm_v2()
	234156	+** + sqlite3changeset_apply_strm_v3()
	234157	+**
	234158	+** Arguments passed to this function are as follows:
	234159	+**
	234160	+** db:
	234161	+** Database handle to apply changeset to main database of.
	234162	+**
	234163	+** nChangeset/pChangeset:
	234164	+** These are both passed zero for the streaming variants. For the normal
	234165	+** apply() functions, these are passed the size of and the buffer containing
	234166	+** the changeset, respectively.
	234167	+**
	234168	+** xInput/pIn:
	234169	+** These are both passed zero for the normal variants. For the streaming
	234170	+** apply() functions, these are passed the input callback and context
	234171	+** pointer, respectively.
	234172	+**
	234173	+** xFilter:
	234174	+** The filter function as passed to apply() or apply_v2() (to filter by
	234175	+** table name), if any. This is always NULL for apply_v3() calls.
	234176	+**
	234177	+** xFilterIter:
	234178	+** The filter function as passed to apply_v3(), if any.
	234179	+**
	234180	+** xConflict:
	234181	+** The conflict handler callback (must not be NULL).
	234182	+**
	234183	+** pCtx:
	234184	+** The context pointer passed to the xFilter and xConflict handler callbacks.
	234185	+**
	234186	+** ppRebase, pnRebase:
	234187	+** Zero for apply(). The rebase changeset output pointers, if any, for
	234188	+** apply_v2() and apply_v3().
	234189	+**
	234190	+** flags:
	234191	+** Zero for apply(). The flags parameter for apply_v2() and apply_v3().
	234192	+*/
	234193	+static int sessionChangesetApplyV23(
	234194	+ sqlite3 db, / Apply change to "main" db of this handle */
	234195	+ int nChangeset, /* Size of changeset in bytes */
	234196	+ void pChangeset, / Changeset blob */
	234197	+ int (xInput)(void pIn, void pData, int pnData), /* Input function */
	234198	+ void pIn, / First arg for xInput */
	234199	+ int(*xFilter)(
	234200	+ void pCtx, / Copy of sixth arg to _apply() */
	234201	+ const char zTab / Table name */
	234202	+ ),
	234203	+ int(*xFilterIter)(
	234204	+ void pCtx, / Copy of sixth arg to _apply() */
	234205	+ sqlite3_changeset_iter p / Handle describing current change */
	234206	+ ),
	234207	+ int(*xConflict)(
	234208	+ void pCtx, / Copy of sixth arg to _apply() */
	234209	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	234210	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	234211	+ ),
	234212	+ void pCtx, / First argument passed to xConflict */
	234213	+ void *ppRebase, int pnRebase,
	234214	+ int flags
	234215	+){
	234216	+ sqlite3_changeset_iter pIter; / Iterator to skip through changeset */
	234217	+ int bInverse = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
	234218	+ int rc = sessionChangesetStart(
	234219	+ &pIter, xInput, pIn, nChangeset, pChangeset, bInverse, 1
	234220	+ );
	234221	+ if( rc==SQLITE_OK ){
	234222	+ rc = sessionChangesetApply(db, pIter,
	234223	+ xFilter, xFilterIter, xConflict, pCtx, ppRebase, pnRebase, flags
	234224	+ );
	234225	+ }
	234226	+ return rc;
	234227	+}
233440	234228
233441	234229	/*
233442	234230	** Apply the changeset passed via pChangeset/nChangeset to the main
233443	234231	** database attached to handle "db".
233444	234232	*/
		@@ -233457,21 +234245,43 @@
233457	234245	),
233458	234246	void pCtx, / First argument passed to xConflict */
233459	234247	void *ppRebase, int pnRebase,
233460	234248	int flags
233461	234249	){
233462		- sqlite3_changeset_iter pIter; / Iterator to skip through changeset */
233463		- int bInv = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
233464		- int rc = sessionChangesetStart(&pIter, 0, 0, nChangeset, pChangeset, bInv, 1);
233465		-
233466		- if( rc==SQLITE_OK ){
233467		- rc = sessionChangesetApply(
233468		- db, pIter, xFilter, xConflict, pCtx, ppRebase, pnRebase, flags
233469		- );
233470		- }
233471		-
233472		- return rc;
	234250	+ return sessionChangesetApplyV23(db,
	234251	+ nChangeset, pChangeset, 0, 0,
	234252	+ xFilter, 0, xConflict, pCtx,
	234253	+ ppRebase, pnRebase, flags
	234254	+ );
	234255	+}
	234256	+
	234257	+/*
	234258	+** Apply the changeset passed via pChangeset/nChangeset to the main
	234259	+** database attached to handle "db".
	234260	+*/
	234261	+SQLITE_API int sqlite3changeset_apply_v3(
	234262	+ sqlite3 db, / Apply change to "main" db of this handle */
	234263	+ int nChangeset, /* Size of changeset in bytes */
	234264	+ void pChangeset, / Changeset blob */
	234265	+ int(*xFilter)(
	234266	+ void pCtx, / Copy of sixth arg to _apply() */
	234267	+ sqlite3_changeset_iter p / Handle describing current change */
	234268	+ ),
	234269	+ int(*xConflict)(
	234270	+ void pCtx, / Copy of sixth arg to _apply() */
	234271	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	234272	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	234273	+ ),
	234274	+ void pCtx, / First argument passed to xConflict */
	234275	+ void *ppRebase, int pnRebase,
	234276	+ int flags
	234277	+){
	234278	+ return sessionChangesetApplyV23(db,
	234279	+ nChangeset, pChangeset, 0, 0,
	234280	+ 0, xFilter, xConflict, pCtx,
	234281	+ ppRebase, pnRebase, flags
	234282	+ );
233473	234283	}
233474	234284
233475	234285	/*
233476	234286	** Apply the changeset passed via pChangeset/nChangeset to the main database
233477	234287	** attached to handle "db". Invoke the supplied conflict handler callback
		@@ -233490,20 +234300,45 @@
233490	234300	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233491	234301	sqlite3_changeset_iter p / Handle describing change and conflict */
233492	234302	),
233493	234303	void pCtx / First argument passed to xConflict */
233494	234304	){
233495		- return sqlite3changeset_apply_v2(
233496		- db, nChangeset, pChangeset, xFilter, xConflict, pCtx, 0, 0, 0
	234305	+ return sessionChangesetApplyV23(db,
	234306	+ nChangeset, pChangeset, 0, 0,
	234307	+ xFilter, 0, xConflict, pCtx,
	234308	+ 0, 0, 0
233497	234309	);
233498	234310	}
233499	234311
233500	234312	/*
233501	234313	** Apply the changeset passed via xInput/pIn to the main database
233502	234314	** attached to handle "db". Invoke the supplied conflict handler callback
233503	234315	** to resolve any conflicts encountered while applying the change.
233504	234316	*/
	234317	+SQLITE_API int sqlite3changeset_apply_v3_strm(
	234318	+ sqlite3 db, / Apply change to "main" db of this handle */
	234319	+ int (xInput)(void pIn, void pData, int pnData), /* Input function */
	234320	+ void pIn, / First arg for xInput */
	234321	+ int(*xFilter)(
	234322	+ void pCtx, / Copy of sixth arg to _apply() */
	234323	+ sqlite3_changeset_iter *p
	234324	+ ),
	234325	+ int(*xConflict)(
	234326	+ void pCtx, / Copy of sixth arg to _apply() */
	234327	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	234328	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	234329	+ ),
	234330	+ void pCtx, / First argument passed to xConflict */
	234331	+ void *ppRebase, int pnRebase,
	234332	+ int flags
	234333	+){
	234334	+ return sessionChangesetApplyV23(db,
	234335	+ 0, 0, xInput, pIn,
	234336	+ 0, xFilter, xConflict, pCtx,
	234337	+ ppRebase, pnRebase, flags
	234338	+ );
	234339	+}
233505	234340	SQLITE_API int sqlite3changeset_apply_v2_strm(
233506	234341	sqlite3 db, / Apply change to "main" db of this handle */
233507	234342	int (xInput)(void pIn, void pData, int pnData), /* Input function */
233508	234343	void pIn, / First arg for xInput */
233509	234344	int(*xFilter)(
		@@ -233517,19 +234352,15 @@
233517	234352	),
233518	234353	void pCtx, / First argument passed to xConflict */
233519	234354	void *ppRebase, int pnRebase,
233520	234355	int flags
233521	234356	){
233522		- sqlite3_changeset_iter pIter; / Iterator to skip through changeset */
233523		- int bInverse = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
233524		- int rc = sessionChangesetStart(&pIter, xInput, pIn, 0, 0, bInverse, 1);
233525		- if( rc==SQLITE_OK ){
233526		- rc = sessionChangesetApply(
233527		- db, pIter, xFilter, xConflict, pCtx, ppRebase, pnRebase, flags
233528		- );
233529		- }
233530		- return rc;
	234357	+ return sessionChangesetApplyV23(db,
	234358	+ 0, 0, xInput, pIn,
	234359	+ xFilter, 0, xConflict, pCtx,
	234360	+ ppRebase, pnRebase, flags
	234361	+ );
233531	234362	}
233532	234363	SQLITE_API int sqlite3changeset_apply_strm(
233533	234364	sqlite3 db, / Apply change to "main" db of this handle */
233534	234365	int (xInput)(void pIn, void pData, int pnData), /* Input function */
233535	234366	void pIn, / First arg for xInput */
		@@ -233542,12 +234373,14 @@
233542	234373	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233543	234374	sqlite3_changeset_iter p / Handle describing change and conflict */
233544	234375	),
233545	234376	void pCtx / First argument passed to xConflict */
233546	234377	){
233547		- return sqlite3changeset_apply_v2_strm(
233548		- db, xInput, pIn, xFilter, xConflict, pCtx, 0, 0, 0
	234378	+ return sessionChangesetApplyV23(db,
	234379	+ 0, 0, xInput, pIn,
	234380	+ xFilter, 0, xConflict, pCtx,
	234381	+ 0, 0, 0
233549	234382	);
233550	234383	}
233551	234384
233552	234385	/*
233553	234386	** sqlite3_changegroup handle.
		@@ -234165,18 +234998,23 @@
234165	234998	*/
234166	234999	SQLITE_API int sqlite3changegroup_add_change(
234167	235000	sqlite3_changegroup *pGrp,
234168	235001	sqlite3_changeset_iter *pIter
234169	235002	){
	235003	+ int rc = SQLITE_OK;
	235004	+
234170	235005	if( pIter->in.iCurrent==pIter->in.iNext
234171	235006	\|\| pIter->rc!=SQLITE_OK
234172	235007	\|\| pIter->bInvert
234173	235008	){
234174	235009	/* Iterator does not point to any valid entry or is an INVERT iterator. */
234175		- return SQLITE_ERROR;
	235010	+ rc = SQLITE_ERROR;
	235011	+ }else{
	235012	+ pIter->in.bNoDiscard = 1;
	235013	+ rc = sessionOneChangeToHash(pGrp, pIter, 0);
234176	235014	}
234177		- return sessionOneChangeToHash(pGrp, pIter, 0);
	235015	+ return rc;
234178	235016	}
234179	235017
234180	235018	/*
234181	235019	** Obtain a buffer containing a changeset representing the concatenation
234182	235020	** of all changesets added to the group so far.
		@@ -235470,10 +236308,11 @@
235470	236308	/* #include "sqlite3ext.h" */
235471	236309	SQLITE_EXTENSION_INIT1
235472	236310
235473	236311	/* #include <string.h> */
235474	236312	/* #include <assert.h> */
	236313	+/* #include <stddef.h> */
235475	236314
235476	236315	#ifndef SQLITE_AMALGAMATION
235477	236316
235478	236317	typedef unsigned char u8;
235479	236318	typedef unsigned int u32;
		@@ -235529,11 +236368,11 @@
235529	236368
235530	236369	/*
235531	236370	** Macros needed to provide flexible arrays in a portable way
235532	236371	*/
235533	236372	#ifndef offsetof
235534		-# define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
	236373	+# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
235535	236374	#endif
235536	236375	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
235537	236376	# define FLEXARRAY
235538	236377	#else
235539	236378	# define FLEXARRAY 1
		@@ -244713,10 +245552,40 @@
244713	245552	Fts5Buffer term; /* Current term */
244714	245553	i64 iRowid; /* Current rowid */
244715	245554	int nPos; /* Number of bytes in current position list */
244716	245555	u8 bDel; /* True if the delete flag is set */
244717	245556	};
	245557	+
	245558	+static int fts5IndexCorruptRowid(Fts5Index *pIdx, i64 iRowid){
	245559	+ pIdx->rc = FTS5_CORRUPT;
	245560	+ sqlite3Fts5ConfigErrmsg(pIdx->pConfig,
	245561	+ "fts5: corruption found reading blob %lld from table \"%s\"",
	245562	+ iRowid, pIdx->pConfig->zName
	245563	+ );
	245564	+ return SQLITE_CORRUPT_VTAB;
	245565	+}
	245566	+#define FTS5_CORRUPT_ROWID(pIdx, iRowid) fts5IndexCorruptRowid(pIdx, iRowid)
	245567	+
	245568	+static int fts5IndexCorruptIter(Fts5Index pIdx, Fts5SegIter pIter){
	245569	+ pIdx->rc = FTS5_CORRUPT;
	245570	+ sqlite3Fts5ConfigErrmsg(pIdx->pConfig,
	245571	+ "fts5: corruption on page %d, segment %d, table \"%s\"",
	245572	+ pIter->iLeafPgno, pIter->pSeg->iSegid, pIdx->pConfig->zName
	245573	+ );
	245574	+ return SQLITE_CORRUPT_VTAB;
	245575	+}
	245576	+#define FTS5_CORRUPT_ITER(pIdx, pIter) fts5IndexCorruptIter(pIdx, pIter)
	245577	+
	245578	+static int fts5IndexCorruptIdx(Fts5Index *pIdx){
	245579	+ pIdx->rc = FTS5_CORRUPT;
	245580	+ sqlite3Fts5ConfigErrmsg(pIdx->pConfig,
	245581	+ "fts5: corruption in table \"%s\"", pIdx->pConfig->zName
	245582	+ );
	245583	+ return SQLITE_CORRUPT_VTAB;
	245584	+}
	245585	+#define FTS5_CORRUPT_IDX(pIdx) fts5IndexCorruptIdx(pIdx)
	245586	+
244718	245587
244719	245588	/*
244720	245589	** Array of tombstone pages. Reference counted.
244721	245590	*/
244722	245591	struct Fts5TombstoneArray {
		@@ -245003,11 +245872,11 @@
245003	245872	/* If either of the sqlite3_blob_open() or sqlite3_blob_reopen() calls
245004	245873	** above returned SQLITE_ERROR, return SQLITE_CORRUPT_VTAB instead.
245005	245874	** All the reasons those functions might return SQLITE_ERROR - missing
245006	245875	** table, missing row, non-blob/text in block column - indicate
245007	245876	** backing store corruption. */
245008		- if( rc==SQLITE_ERROR ) rc = FTS5_CORRUPT;
	245877	+ if( rc==SQLITE_ERROR ) rc = FTS5_CORRUPT_ROWID(p, iRowid);
245009	245878
245010	245879	if( rc==SQLITE_OK ){
245011	245880	u8 aOut = 0; / Read blob data into this buffer */
245012	245881	int nByte = sqlite3_blob_bytes(p->pReader);
245013	245882	int szData = (sizeof(Fts5Data) + 7) & ~7;
		@@ -245053,11 +245922,11 @@
245053	245922
245054	245923	static Fts5Data fts5LeafRead(Fts5Index p, i64 iRowid){
245055	245924	Fts5Data *pRet = fts5DataRead(p, iRowid);
245056	245925	if( pRet ){
245057	245926	if( pRet->nn<4 \|\| pRet->szLeaf>pRet->nn ){
245058		- p->rc = FTS5_CORRUPT;
	245927	+ FTS5_CORRUPT_ROWID(p, iRowid);
245059	245928	fts5DataRelease(pRet);
245060	245929	pRet = 0;
245061	245930	}
245062	245931	}
245063	245932	return pRet;
		@@ -245412,12 +246281,18 @@
245412	246281	pData = fts5DataRead(p, FTS5_STRUCTURE_ROWID);
245413	246282	if( p->rc==SQLITE_OK ){
245414	246283	/* TODO: Do we need this if the leaf-index is appended? Probably... */
245415	246284	memset(&pData->p[pData->nn], 0, FTS5_DATA_PADDING);
245416	246285	p->rc = fts5StructureDecode(pData->p, pData->nn, &iCookie, &pRet);
245417		- if( p->rc==SQLITE_OK && (pConfig->pgsz==0 \|\| pConfig->iCookie!=iCookie) ){
245418		- p->rc = sqlite3Fts5ConfigLoad(pConfig, iCookie);
	246286	+ if( p->rc==SQLITE_OK ){
	246287	+ if( (pConfig->pgsz==0 \|\| pConfig->iCookie!=iCookie) ){
	246288	+ p->rc = sqlite3Fts5ConfigLoad(pConfig, iCookie);
	246289	+ }
	246290	+ }else if( p->rc==SQLITE_CORRUPT_VTAB ){
	246291	+ sqlite3Fts5ConfigErrmsg(p->pConfig,
	246292	+ "fts5: corrupt structure record for table \"%s\"", p->pConfig->zName
	246293	+ );
245419	246294	}
245420	246295	fts5DataRelease(pData);
245421	246296	if( p->rc!=SQLITE_OK ){
245422	246297	fts5StructureRelease(pRet);
245423	246298	pRet = 0;
		@@ -246036,11 +246911,11 @@
246036	246911
246037	246912	ASSERT_SZLEAF_OK(pIter->pLeaf);
246038	246913	while( iOff>=pIter->pLeaf->szLeaf ){
246039	246914	fts5SegIterNextPage(p, pIter);
246040	246915	if( pIter->pLeaf==0 ){
246041		- if( p->rc==SQLITE_OK ) p->rc = FTS5_CORRUPT;
	246916	+ if( p->rc==SQLITE_OK ) FTS5_CORRUPT_ITER(p, pIter);
246042	246917	return;
246043	246918	}
246044	246919	iOff = 4;
246045	246920	a = pIter->pLeaf->p;
246046	246921	}
		@@ -246068,11 +246943,11 @@
246068	246943	i64 iOff = pIter->iLeafOffset; /* Offset to read at */
246069	246944	int nNew; /* Bytes of new data */
246070	246945
246071	246946	iOff += fts5GetVarint32(&a[iOff], nNew);
246072	246947	if( iOff+nNew>pIter->pLeaf->szLeaf \|\| nKeep>pIter->term.n \|\| nNew==0 ){
246073		- p->rc = FTS5_CORRUPT;
	246948	+ FTS5_CORRUPT_ITER(p, pIter);
246074	246949	return;
246075	246950	}
246076	246951	pIter->term.n = nKeep;
246077	246952	fts5BufferAppendBlob(&p->rc, &pIter->term, nNew, &a[iOff]);
246078	246953	assert( pIter->term.n<=pIter->term.nSpace );
		@@ -246110,13 +246985,13 @@
246110	246985	** Allocate a tombstone hash page array object (pIter->pTombArray) for
246111	246986	** the iterator passed as the second argument. If an OOM error occurs,
246112	246987	** leave an error in the Fts5Index object.
246113	246988	*/
246114	246989	static void fts5SegIterAllocTombstone(Fts5Index p, Fts5SegIter pIter){
246115		- const int nTomb = pIter->pSeg->nPgTombstone;
	246990	+ const i64 nTomb = (i64)pIter->pSeg->nPgTombstone;
246116	246991	if( nTomb>0 ){
246117		- int nByte = SZ_FTS5TOMBSTONEARRAY(nTomb+1);
	246992	+ i64 nByte = SZ_FTS5TOMBSTONEARRAY(nTomb+1);
246118	246993	Fts5TombstoneArray *pNew;
246119	246994	pNew = (Fts5TombstoneArray*)sqlite3Fts5MallocZero(&p->rc, nByte);
246120	246995	if( pNew ){
246121	246996	pNew->nTombstone = nTomb;
246122	246997	pNew->nRef = 1;
		@@ -246263,11 +247138,11 @@
246263	247138	}else{
246264	247139	int iRowidOff;
246265	247140	iRowidOff = fts5LeafFirstRowidOff(pNew);
246266	247141	if( iRowidOff ){
246267	247142	if( iRowidOff>=pNew->szLeaf ){
246268		- p->rc = FTS5_CORRUPT;
	247143	+ FTS5_CORRUPT_ITER(p, pIter);
246269	247144	}else{
246270	247145	pIter->pLeaf = pNew;
246271	247146	pIter->iLeafOffset = iRowidOff;
246272	247147	}
246273	247148	}
		@@ -246497,11 +247372,11 @@
246497	247372	pIter->iEndofDoclist = iOff;
246498	247373	bNewTerm = 1;
246499	247374	}
246500	247375	assert_nc( iOff<pLeaf->szLeaf );
246501	247376	if( iOff>pLeaf->szLeaf ){
246502		- p->rc = FTS5_CORRUPT;
	247377	+ FTS5_CORRUPT_ITER(p, pIter);
246503	247378	return;
246504	247379	}
246505	247380	}
246506	247381	}
246507	247382
		@@ -246605,22 +247480,24 @@
246605	247480	if( pLast ){
246606	247481	int iOff;
246607	247482	fts5DataRelease(pIter->pLeaf);
246608	247483	pIter->pLeaf = pLast;
246609	247484	pIter->iLeafPgno = pgnoLast;
246610		- iOff = fts5LeafFirstRowidOff(pLast);
246611		- if( iOff>pLast->szLeaf ){
246612		- p->rc = FTS5_CORRUPT;
246613		- return;
246614		- }
246615		- iOff += fts5GetVarint(&pLast->p[iOff], (u64*)&pIter->iRowid);
246616		- pIter->iLeafOffset = iOff;
246617		-
246618		- if( fts5LeafIsTermless(pLast) ){
246619		- pIter->iEndofDoclist = pLast->nn+1;
246620		- }else{
246621		- pIter->iEndofDoclist = fts5LeafFirstTermOff(pLast);
	247485	+ if( p->rc==SQLITE_OK ){
	247486	+ iOff = fts5LeafFirstRowidOff(pLast);
	247487	+ if( iOff>pLast->szLeaf ){
	247488	+ FTS5_CORRUPT_ITER(p, pIter);
	247489	+ return;
	247490	+ }
	247491	+ iOff += fts5GetVarint(&pLast->p[iOff], (u64*)&pIter->iRowid);
	247492	+ pIter->iLeafOffset = iOff;
	247493	+
	247494	+ if( fts5LeafIsTermless(pLast) ){
	247495	+ pIter->iEndofDoclist = pLast->nn+1;
	247496	+ }else{
	247497	+ pIter->iEndofDoclist = fts5LeafFirstTermOff(pLast);
	247498	+ }
246622	247499	}
246623	247500	}
246624	247501
246625	247502	fts5SegIterReverseInitPage(p, pIter);
246626	247503	}
		@@ -246686,11 +247563,11 @@
246686	247563
246687	247564	iPgidx = (u32)pIter->pLeaf->szLeaf;
246688	247565	iPgidx += fts5GetVarint32(&a[iPgidx], iTermOff);
246689	247566	iOff = iTermOff;
246690	247567	if( iOff>n ){
246691		- p->rc = FTS5_CORRUPT;
	247568	+ FTS5_CORRUPT_ITER(p, pIter);
246692	247569	return;
246693	247570	}
246694	247571
246695	247572	while( 1 ){
246696	247573
		@@ -246729,11 +247606,11 @@
246729	247606	iPgidx += fts5GetVarint32(&a[iPgidx], nKeep);
246730	247607	iTermOff += nKeep;
246731	247608	iOff = iTermOff;
246732	247609
246733	247610	if( iOff>=n ){
246734		- p->rc = FTS5_CORRUPT;
	247611	+ FTS5_CORRUPT_ITER(p, pIter);
246735	247612	return;
246736	247613	}
246737	247614
246738	247615	/* Read the nKeep field of the next term. */
246739	247616	fts5FastGetVarint32(a, iOff, nKeep);
		@@ -246751,11 +247628,11 @@
246751	247628	a = pIter->pLeaf->p;
246752	247629	if( fts5LeafIsTermless(pIter->pLeaf)==0 ){
246753	247630	iPgidx = (u32)pIter->pLeaf->szLeaf;
246754	247631	iPgidx += fts5GetVarint32(&pIter->pLeaf->p[iPgidx], iOff);
246755	247632	if( iOff<4 \|\| (i64)iOff>=pIter->pLeaf->szLeaf ){
246756		- p->rc = FTS5_CORRUPT;
	247633	+ FTS5_CORRUPT_ITER(p, pIter);
246757	247634	return;
246758	247635	}else{
246759	247636	nKeep = 0;
246760	247637	iTermOff = iOff;
246761	247638	n = (u32)pIter->pLeaf->nn;
		@@ -246766,11 +247643,11 @@
246766	247643	}while( 1 );
246767	247644	}
246768	247645
246769	247646	search_success:
246770	247647	if( (i64)iOff+nNew>n \|\| nNew<1 ){
246771		- p->rc = FTS5_CORRUPT;
	247648	+ FTS5_CORRUPT_ITER(p, pIter);
246772	247649	return;
246773	247650	}
246774	247651	pIter->iLeafOffset = iOff + nNew;
246775	247652	pIter->iTermLeafOffset = pIter->iLeafOffset;
246776	247653	pIter->iTermLeafPgno = pIter->iLeafPgno;
		@@ -247231,11 +248108,11 @@
247231	248108	int iLeafPgno
247232	248109	){
247233	248110	assert( iLeafPgno>pIter->iLeafPgno );
247234	248111
247235	248112	if( iLeafPgno>pIter->pSeg->pgnoLast ){
247236		- p->rc = FTS5_CORRUPT;
	248113	+ FTS5_CORRUPT_IDX(p);
247237	248114	}else{
247238	248115	fts5DataRelease(pIter->pNextLeaf);
247239	248116	pIter->pNextLeaf = 0;
247240	248117	pIter->iLeafPgno = iLeafPgno-1;
247241	248118
		@@ -247246,11 +248123,11 @@
247246	248123	iOff = fts5LeafFirstRowidOff(pIter->pLeaf);
247247	248124	if( iOff>0 ){
247248	248125	u8 *a = pIter->pLeaf->p;
247249	248126	int n = pIter->pLeaf->szLeaf;
247250	248127	if( iOff<4 \|\| iOff>=n ){
247251		- p->rc = FTS5_CORRUPT;
	248128	+ FTS5_CORRUPT_IDX(p);
247252	248129	}else{
247253	248130	iOff += fts5GetVarint(&a[iOff], (u64*)&pIter->iRowid);
247254	248131	pIter->iLeafOffset = iOff;
247255	248132	fts5SegIterLoadNPos(p, pIter);
247256	248133	}
		@@ -247725,11 +248602,11 @@
247725	248602	nRem -= nChunk;
247726	248603	fts5DataRelease(pData);
247727	248604	if( nRem<=0 ){
247728	248605	break;
247729	248606	}else if( pSeg->pSeg==0 ){
247730		- p->rc = FTS5_CORRUPT;
	248607	+ FTS5_CORRUPT_IDX(p);
247731	248608	return;
247732	248609	}else{
247733	248610	pgno++;
247734	248611	pData = fts5LeafRead(p, FTS5_SEGMENT_ROWID(pSeg->pSeg->iSegid, pgno));
247735	248612	if( pData==0 ) break;
		@@ -248828,11 +249705,11 @@
248828	249705	if( iOff>pData->szLeaf ){
248829	249706	/* This can occur if the pages that the segments occupy overlap - if
248830	249707	** a single page has been assigned to more than one segment. In
248831	249708	** this case a prior iteration of this loop may have corrupted the
248832	249709	** segment currently being trimmed. */
248833		- p->rc = FTS5_CORRUPT;
	249710	+ FTS5_CORRUPT_ROWID(p, iLeafRowid);
248834	249711	}else{
248835	249712	fts5BufferZero(&buf);
248836	249713	fts5BufferGrow(&p->rc, &buf, pData->nn);
248837	249714	fts5BufferAppendBlob(&p->rc, &buf, sizeof(aHdr), aHdr);
248838	249715	fts5BufferAppendVarint(&p->rc, &buf, pSeg->term.n);
		@@ -249295,11 +250172,11 @@
249295	250172	fts5DataRelease(pLeaf);
249296	250173	pLeaf = 0;
249297	250174	}else if( bDetailNone ){
249298	250175	break;
249299	250176	}else if( iNext>=pLeaf->szLeaf \|\| pLeaf->nn<pLeaf->szLeaf \|\| iNext<4 ){
249300		- p->rc = FTS5_CORRUPT;
	250177	+ FTS5_CORRUPT_ROWID(p, iRowid);
249301	250178	break;
249302	250179	}else{
249303	250180	int nShift = iNext - 4;
249304	250181	int nPg;
249305	250182
		@@ -249315,11 +250192,11 @@
249315	250192	int i1 = pLeaf->szLeaf;
249316	250193	int i2 = 0;
249317	250194
249318	250195	i1 += fts5GetVarint32(&aPg[i1], iFirst);
249319	250196	if( iFirst<iNext ){
249320		- p->rc = FTS5_CORRUPT;
	250197	+ FTS5_CORRUPT_ROWID(p, iRowid);
249321	250198	break;
249322	250199	}
249323	250200	aIdx = sqlite3Fts5MallocZero(&p->rc, (pLeaf->nn-pLeaf->szLeaf)+2);
249324	250201	if( aIdx==0 ) break;
249325	250202	i2 = sqlite3Fts5PutVarint(aIdx, iFirst-nShift);
		@@ -249538,18 +250415,18 @@
249538	250415
249539	250416	nPrefix = MIN(nPrefix, nPrefix2);
249540	250417	nSuffix = (nPrefix2 + nSuffix2) - nPrefix;
249541	250418
249542	250419	if( (iKeyOff+nSuffix)>iPgIdx \|\| (iNextOff+nSuffix2)>iPgIdx ){
249543		- p->rc = FTS5_CORRUPT;
	250420	+ FTS5_CORRUPT_IDX(p);
249544	250421	}else{
249545	250422	if( iKey!=1 ){
249546	250423	iOff += sqlite3Fts5PutVarint(&aPg[iOff], nPrefix);
249547	250424	}
249548	250425	iOff += sqlite3Fts5PutVarint(&aPg[iOff], nSuffix);
249549	250426	if( nPrefix2>pSeg->term.n ){
249550		- p->rc = FTS5_CORRUPT;
	250427	+ FTS5_CORRUPT_IDX(p);
249551	250428	}else if( nPrefix2>nPrefix ){
249552	250429	memcpy(&aPg[iOff], &pSeg->term.p[nPrefix], nPrefix2-nPrefix);
249553	250430	iOff += (nPrefix2-nPrefix);
249554	250431	}
249555	250432	memmove(&aPg[iOff], &aPg[iNextOff], nSuffix2);
		@@ -249969,11 +250846,11 @@
249969	250846	}
249970	250847	assert( pStruct->aLevel[i].nMerge<=nThis );
249971	250848	}
249972	250849
249973	250850	nByte += (((i64)pStruct->nLevel)+1) * sizeof(Fts5StructureLevel);
249974		- assert( nByte==SZ_FTS5STRUCTURE(pStruct->nLevel+2) );
	250851	+ assert( nByte==(i64)SZ_FTS5STRUCTURE(pStruct->nLevel+2) );
249975	250852	pNew = (Fts5Structure*)sqlite3Fts5MallocZero(&p->rc, nByte);
249976	250853
249977	250854	if( pNew ){
249978	250855	Fts5StructureLevel *pLvl;
249979	250856	nByte = nSeg * sizeof(Fts5StructureSegment);
		@@ -250338,11 +251215,11 @@
250338	251215	fts5PrefixMergerInsertByPosition(&pHead, pSave);
250339	251216	pSave = pNext;
250340	251217	}
250341	251218
250342	251219	if( pHead==0 \|\| pHead->pNext==0 ){
250343		- p->rc = FTS5_CORRUPT;
	251220	+ FTS5_CORRUPT_IDX(p);
250344	251221	break;
250345	251222	}
250346	251223
250347	251224	/* See the earlier comment in this function for an explanation of why
250348	251225	** corrupt input position lists might cause the output to consume
		@@ -250375,11 +251252,11 @@
250375	251252
250376	251253	/* WRITEPOSLISTSIZE */
250377	251254	assert_nc( tmp.n+nTail<=nTmp );
250378	251255	assert( tmp.n+nTail<=nTmp+nMerge*10 );
250379	251256	if( tmp.n+nTail>nTmp-FTS5_DATA_ZERO_PADDING ){
250380		- if( p->rc==SQLITE_OK ) p->rc = FTS5_CORRUPT;
	251257	+ if( p->rc==SQLITE_OK ) FTS5_CORRUPT_IDX(p);
250381	251258	break;
250382	251259	}
250383	251260	fts5BufferSafeAppendVarint(&out, (tmp.n+nTail) * 2);
250384	251261	fts5BufferSafeAppendBlob(&out, tmp.p, tmp.n);
250385	251262	if( nTail>0 ){
		@@ -252408,23 +253285,31 @@
252408	253285	}
252409	253286
252410	253287	/*
252411	253288	** This function is also purely an internal test. It does not contribute to
252412	253289	** FTS functionality, or even the integrity-check, in any way.
	253290	+**
	253291	+** This function sets output variable (*pbFail) to true if the test fails. Or
	253292	+** leaves it unchanged if the test succeeds.
252413	253293	*/
252414	253294	static void fts5TestTerm(
252415	253295	Fts5Index *p,
252416	253296	Fts5Buffer pPrev, / Previous term */
252417	253297	const char z, int n, / Possibly new term to test */
252418	253298	u64 expected,
252419		- u64 *pCksum
	253299	+ u64 *pCksum,
	253300	+ int *pbFail
252420	253301	){
252421	253302	int rc = p->rc;
252422	253303	if( pPrev->n==0 ){
252423	253304	fts5BufferSet(&rc, pPrev, n, (const u8*)z);
252424	253305	}else
252425		- if( rc==SQLITE_OK && (pPrev->n!=n \|\| memcmp(pPrev->p, z, n)) ){
	253306	+ if( *pbFail==0
	253307	+ && rc==SQLITE_OK
	253308	+ && (pPrev->n!=n \|\| memcmp(pPrev->p, z, n))
	253309	+ && (p->pHash==0 \|\| p->pHash->nEntry==0)
	253310	+ ){
252426	253311	u64 cksum3 = *pCksum;
252427	253312	const char zTerm = (const char)&pPrev->p[1]; /* term sans prefix-byte */
252428	253313	int nTerm = pPrev->n-1; /* Size of zTerm in bytes */
252429	253314	int iIdx = (pPrev->p[0] - FTS5_MAIN_PREFIX);
252430	253315	int flags = (iIdx==0 ? 0 : FTS5INDEX_QUERY_PREFIX);
		@@ -252470,20 +253355,20 @@
252470	253355
252471	253356	cksum3 ^= ck1;
252472	253357	fts5BufferSet(&rc, pPrev, n, (const u8*)z);
252473	253358
252474	253359	if( rc==SQLITE_OK && cksum3!=expected ){
252475		- rc = FTS5_CORRUPT;
	253360	+ *pbFail = 1;
252476	253361	}
252477	253362	*pCksum = cksum3;
252478	253363	}
252479	253364	p->rc = rc;
252480	253365	}
252481	253366
252482	253367	#else
252483	253368	# define fts5TestDlidxReverse(x,y,z)
252484		-# define fts5TestTerm(u,v,w,x,y,z)
	253369	+# define fts5TestTerm(t,u,v,w,x,y,z)
252485	253370	#endif
252486	253371
252487	253372	/*
252488	253373	** Check that:
252489	253374	**
		@@ -252504,18 +253389,21 @@
252504	253389	/* Now check that the iter.nEmpty leaves following the current leaf
252505	253390	** (a) exist and (b) contain no terms. */
252506	253391	for(i=iFirst; p->rc==SQLITE_OK && i<=iLast; i++){
252507	253392	Fts5Data *pLeaf = fts5DataRead(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
252508	253393	if( pLeaf ){
252509		- if( !fts5LeafIsTermless(pLeaf) ) p->rc = FTS5_CORRUPT;
252510		- if( i>=iNoRowid && 0!=fts5LeafFirstRowidOff(pLeaf) ) p->rc = FTS5_CORRUPT;
	253394	+ if( !fts5LeafIsTermless(pLeaf)
	253395	+ \|\| (i>=iNoRowid && 0!=fts5LeafFirstRowidOff(pLeaf))
	253396	+ ){
	253397	+ FTS5_CORRUPT_ROWID(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
	253398	+ }
252511	253399	}
252512	253400	fts5DataRelease(pLeaf);
252513	253401	}
252514	253402	}
252515	253403
252516		-static void fts5IntegrityCheckPgidx(Fts5Index p, Fts5Data pLeaf){
	253404	+static void fts5IntegrityCheckPgidx(Fts5Index p, i64 iRowid, Fts5Data pLeaf){
252517	253405	i64 iTermOff = 0;
252518	253406	int ii;
252519	253407
252520	253408	Fts5Buffer buf1 = {0,0,0};
252521	253409	Fts5Buffer buf2 = {0,0,0};
		@@ -252529,33 +253417,33 @@
252529	253417	ii += fts5GetVarint32(&pLeaf->p[ii], nIncr);
252530	253418	iTermOff += nIncr;
252531	253419	iOff = iTermOff;
252532	253420
252533	253421	if( iOff>=pLeaf->szLeaf ){
252534		- p->rc = FTS5_CORRUPT;
	253422	+ FTS5_CORRUPT_ROWID(p, iRowid);
252535	253423	}else if( iTermOff==nIncr ){
252536	253424	int nByte;
252537	253425	iOff += fts5GetVarint32(&pLeaf->p[iOff], nByte);
252538	253426	if( (iOff+nByte)>pLeaf->szLeaf ){
252539		- p->rc = FTS5_CORRUPT;
	253427	+ FTS5_CORRUPT_ROWID(p, iRowid);
252540	253428	}else{
252541	253429	fts5BufferSet(&p->rc, &buf1, nByte, &pLeaf->p[iOff]);
252542	253430	}
252543	253431	}else{
252544	253432	int nKeep, nByte;
252545	253433	iOff += fts5GetVarint32(&pLeaf->p[iOff], nKeep);
252546	253434	iOff += fts5GetVarint32(&pLeaf->p[iOff], nByte);
252547	253435	if( nKeep>buf1.n \|\| (iOff+nByte)>pLeaf->szLeaf ){
252548		- p->rc = FTS5_CORRUPT;
	253436	+ FTS5_CORRUPT_ROWID(p, iRowid);
252549	253437	}else{
252550	253438	buf1.n = nKeep;
252551	253439	fts5BufferAppendBlob(&p->rc, &buf1, nByte, &pLeaf->p[iOff]);
252552	253440	}
252553	253441
252554	253442	if( p->rc==SQLITE_OK ){
252555	253443	res = fts5BufferCompare(&buf1, &buf2);
252556		- if( res<=0 ) p->rc = FTS5_CORRUPT;
	253444	+ if( res<=0 ) FTS5_CORRUPT_ROWID(p, iRowid);
252557	253445	}
252558	253446	}
252559	253447	fts5BufferSet(&p->rc, &buf2, buf1.n, buf1.p);
252560	253448	}
252561	253449
		@@ -252612,11 +253500,11 @@
252612	253500	){
252613	253501	/* special case - the very first page in a segment keeps its %_idx
252614	253502	** entry even if all the terms are removed from it by secure-delete
252615	253503	** operations. */
252616	253504	}else{
252617		- p->rc = FTS5_CORRUPT;
	253505	+ FTS5_CORRUPT_ROWID(p, iRow);
252618	253506	}
252619	253507
252620	253508	}else{
252621	253509	int iOff; /* Offset of first term on leaf */
252622	253510	int iRowidOff; /* Offset of first rowid on leaf */
		@@ -252624,19 +253512,19 @@
252624	253512	int res; /* Comparison of term and split-key */
252625	253513
252626	253514	iOff = fts5LeafFirstTermOff(pLeaf);
252627	253515	iRowidOff = fts5LeafFirstRowidOff(pLeaf);
252628	253516	if( iRowidOff>=iOff \|\| iOff>=pLeaf->szLeaf ){
252629		- p->rc = FTS5_CORRUPT;
	253517	+ FTS5_CORRUPT_ROWID(p, iRow);
252630	253518	}else{
252631	253519	iOff += fts5GetVarint32(&pLeaf->p[iOff], nTerm);
252632	253520	res = fts5Memcmp(&pLeaf->p[iOff], zIdxTerm, MIN(nTerm, nIdxTerm));
252633	253521	if( res==0 ) res = nTerm - nIdxTerm;
252634		- if( res<0 ) p->rc = FTS5_CORRUPT;
	253522	+ if( res<0 ) FTS5_CORRUPT_ROWID(p, iRow);
252635	253523	}
252636	253524
252637		- fts5IntegrityCheckPgidx(p, pLeaf);
	253525	+ fts5IntegrityCheckPgidx(p, iRow, pLeaf);
252638	253526	}
252639	253527	fts5DataRelease(pLeaf);
252640	253528	if( p->rc ) break;
252641	253529
252642	253530	/* Now check that the iter.nEmpty leaves following the current leaf
		@@ -252662,11 +253550,11 @@
252662	253550	/* Check any rowid-less pages that occur before the current leaf. */
252663	253551	for(iPg=iPrevLeaf+1; iPg<fts5DlidxIterPgno(pDlidx); iPg++){
252664	253552	iKey = FTS5_SEGMENT_ROWID(iSegid, iPg);
252665	253553	pLeaf = fts5DataRead(p, iKey);
252666	253554	if( pLeaf ){
252667		- if( fts5LeafFirstRowidOff(pLeaf)!=0 ) p->rc = FTS5_CORRUPT;
	253555	+ if( fts5LeafFirstRowidOff(pLeaf)!=0 ) FTS5_CORRUPT_ROWID(p, iKey);
252668	253556	fts5DataRelease(pLeaf);
252669	253557	}
252670	253558	}
252671	253559	iPrevLeaf = fts5DlidxIterPgno(pDlidx);
252672	253560
		@@ -252677,16 +253565,16 @@
252677	253565	if( pLeaf ){
252678	253566	i64 iRowid;
252679	253567	int iRowidOff = fts5LeafFirstRowidOff(pLeaf);
252680	253568	ASSERT_SZLEAF_OK(pLeaf);
252681	253569	if( iRowidOff>=pLeaf->szLeaf ){
252682		- p->rc = FTS5_CORRUPT;
	253570	+ FTS5_CORRUPT_ROWID(p, iKey);
252683	253571	}else if( bSecureDelete==0 \|\| iRowidOff>0 ){
252684	253572	i64 iDlRowid = fts5DlidxIterRowid(pDlidx);
252685	253573	fts5GetVarint(&pLeaf->p[iRowidOff], (u64*)&iRowid);
252686	253574	if( iRowid<iDlRowid \|\| (bSecureDelete==0 && iRowid!=iDlRowid) ){
252687		- p->rc = FTS5_CORRUPT;
	253575	+ FTS5_CORRUPT_ROWID(p, iKey);
252688	253576	}
252689	253577	}
252690	253578	fts5DataRelease(pLeaf);
252691	253579	}
252692	253580	}
		@@ -252734,10 +253622,11 @@
252734	253622
252735	253623	#ifdef SQLITE_DEBUG
252736	253624	/* Used by extra internal tests only run if NDEBUG is not defined */
252737	253625	u64 cksum3 = 0; /* Checksum based on contents of indexes */
252738	253626	Fts5Buffer term = {0,0,0}; /* Buffer used to hold most recent term */
	253627	+ int bTestFail = 0;
252739	253628	#endif
252740	253629	const int flags = FTS5INDEX_QUERY_NOOUTPUT;
252741	253630
252742	253631	/* Load the FTS index structure */
252743	253632	pStruct = fts5StructureRead(p);
		@@ -252776,11 +253665,11 @@
252776	253665	int iOff = 0; /* Offset within poslist */
252777	253666	i64 iRowid = fts5MultiIterRowid(pIter);
252778	253667	char z = (char)fts5MultiIterTerm(pIter, &n);
252779	253668
252780	253669	/* If this is a new term, query for it. Update cksum3 with the results. */
252781		- fts5TestTerm(p, &term, z, n, cksum2, &cksum3);
	253670	+ fts5TestTerm(p, &term, z, n, cksum2, &cksum3, &bTestFail);
252782	253671	if( p->rc ) break;
252783	253672
252784	253673	if( eDetail==FTS5_DETAIL_NONE ){
252785	253674	if( 0==fts5MultiIterIsEmpty(p, pIter) ){
252786	253675	cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n);
		@@ -252794,19 +253683,30 @@
252794	253683	int iTokOff = FTS5_POS2OFFSET(iPos);
252795	253684	cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, iCol, iTokOff, -1, z, n);
252796	253685	}
252797	253686	}
252798	253687	}
252799		- fts5TestTerm(p, &term, 0, 0, cksum2, &cksum3);
	253688	+ fts5TestTerm(p, &term, 0, 0, cksum2, &cksum3, &bTestFail);
252800	253689
252801	253690	fts5MultiIterFree(pIter);
252802		- if( p->rc==SQLITE_OK && bUseCksum && cksum!=cksum2 ) p->rc = FTS5_CORRUPT;
252803		-
252804		- fts5StructureRelease(pStruct);
	253691	+ if( p->rc==SQLITE_OK && bUseCksum && cksum!=cksum2 ){
	253692	+ p->rc = FTS5_CORRUPT;
	253693	+ sqlite3Fts5ConfigErrmsg(p->pConfig,
	253694	+ "fts5: checksum mismatch for table \"%s\"", p->pConfig->zName
	253695	+ );
	253696	+ }
252805	253697	#ifdef SQLITE_DEBUG
	253698	+ /* In SQLITE_DEBUG builds, expensive extra checks were run as part of
	253699	+ ** the integrity-check above. If no other errors were detected, but one
	253700	+ ** of these tests failed, set the result to SQLITE_CORRUPT_VTAB here. */
	253701	+ if( p->rc==SQLITE_OK && bTestFail ){
	253702	+ p->rc = FTS5_CORRUPT;
	253703	+ }
252806	253704	fts5BufferFree(&term);
252807	253705	#endif
	253706	+
	253707	+ fts5StructureRelease(pStruct);
252808	253708	fts5BufferFree(&poslist);
252809	253709	return fts5IndexReturn(p);
252810	253710	}
252811	253711
252812	253712	/*************************************************************************
		@@ -257213,11 +258113,11 @@
257213	258113	int nArg, /* Number of args */
257214	258114	sqlite3_value *apUnused / Function arguments */
257215	258115	){
257216	258116	assert( nArg==0 );
257217	258117	UNUSED_PARAM2(nArg, apUnused);
257218		- sqlite3_result_text(pCtx, "fts5: 2025-04-15 21:59:38 d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5", -1, SQLITE_TRANSIENT);
	258118	+ sqlite3_result_text(pCtx, "fts5: 2025-07-15 19:00:01 9f184f8dfa5ef6d57e10376adc30e0060ceda07d283c23dfdfe3dbdd6608f839", -1, SQLITE_TRANSIENT);
257219	258119	}
257220	258120
257221	258121	/*
257222	258122	** Implementation of fts5_locale(LOCALE, TEXT) function.
257223	258123	**
		@@ -257336,12 +258236,13 @@
257336	258236	}else{
257337	258237	*pzErr = sqlite3_mprintf("unable to validate the inverted index for"
257338	258238	" FTS5 table %s.%s: %s",
257339	258239	zSchema, zTabname, sqlite3_errstr(rc));
257340	258240	}
	258241	+ }else if( (rc&0xff)==SQLITE_CORRUPT ){
	258242	+ rc = SQLITE_OK;
257341	258243	}
257342		-
257343	258244	sqlite3Fts5IndexCloseReader(pTab->p.pIndex);
257344	258245	pTab->p.pConfig->pzErrmsg = 0;
257345	258246
257346	258247	return rc;
257347	258248	}
		@@ -258028,10 +258929,11 @@
258028	258929	ctx.pStorage = p;
258029	258930	ctx.iCol = -1;
258030	258931	for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){
258031	258932	if( pConfig->abUnindexed[iCol-1]==0 ){
258032	258933	sqlite3_value *pVal = 0;
	258934	+ sqlite3_value *pFree = 0;
258033	258935	const char *pText = 0;
258034	258936	int nText = 0;
258035	258937	const char *pLoc = 0;
258036	258938	int nLoc = 0;
258037	258939
		@@ -258044,15 +258946,26 @@
258044	258946	}
258045	258947
258046	258948	if( pConfig->bLocale && sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
258047	258949	rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
258048	258950	}else{
258049		- pText = (const char*)sqlite3_value_text(pVal);
258050		- nText = sqlite3_value_bytes(pVal);
258051		- if( pConfig->bLocale && pSeek ){
258052		- pLoc = (const char*)sqlite3_column_text(pSeek, iCol + pConfig->nCol);
258053		- nLoc = sqlite3_column_bytes(pSeek, iCol + pConfig->nCol);
	258951	+ if( sqlite3_value_type(pVal)!=SQLITE_TEXT ){
	258952	+ /* Make a copy of the value to work with. This is because the call
	258953	+ ** to sqlite3_value_text() below forces the type of the value to
	258954	+ ** SQLITE_TEXT, and we may need to use it again later. */
	258955	+ pFree = pVal = sqlite3_value_dup(pVal);
	258956	+ if( pVal==0 ){
	258957	+ rc = SQLITE_NOMEM;
	258958	+ }
	258959	+ }
	258960	+ if( rc==SQLITE_OK ){
	258961	+ pText = (const char*)sqlite3_value_text(pVal);
	258962	+ nText = sqlite3_value_bytes(pVal);
	258963	+ if( pConfig->bLocale && pSeek ){
	258964	+ pLoc = (const char*)sqlite3_column_text(pSeek, iCol+pConfig->nCol);
	258965	+ nLoc = sqlite3_column_bytes(pSeek, iCol + pConfig->nCol);
	258966	+ }
258054	258967	}
258055	258968	}
258056	258969
258057	258970	if( rc==SQLITE_OK ){
258058	258971	sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
		@@ -258064,10 +258977,11 @@
258064	258977	if( rc==SQLITE_OK && p->aTotalSize[iCol-1]<0 ){
258065	258978	rc = FTS5_CORRUPT;
258066	258979	}
258067	258980	sqlite3Fts5ClearLocale(pConfig);
258068	258981	}
	258982	+ sqlite3_value_free(pFree);
258069	258983	}
258070	258984	}
258071	258985	if( rc==SQLITE_OK && p->nTotalRow<1 ){
258072	258986	rc = FTS5_CORRUPT;
258073	258987	}else{
258074	258988

	--- extsrc/sqlite3.c
	+++ extsrc/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.50.0. By combining all the individual C code files into this
4	** single large file, the entire code can be compiled as a single translation
5	** unit. This allows many compilers to do optimizations that would not be
6	** possible if the files were compiled separately. Performance improvements
7	** of 5% or more are commonly seen when SQLite is compiled as a single
8	** translation unit.
	@@ -16,11 +16,11 @@
16	** if you want a wrapper to interface SQLite with your choice of programming
17	** language. The code for the "sqlite3" command-line shell is also in a
18	** separate file. This file contains only code for the core SQLite library.
19	**
20	** The content in this amalgamation comes from Fossil check-in
21	** d22475b81c4e26ccc50f3b5626d43b32f7a2 with changes in files:
22	**
23	**
24	*/
25	#ifndef SQLITE_AMALGAMATION
26	#define SQLITE_CORE 1
	@@ -463,13 +463,13 @@
463	**
464	** See also: [sqlite3_libversion()],
465	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466	** [sqlite_version()] and [sqlite_source_id()].
467	*/
468	#define SQLITE_VERSION "3.50.0"
469	#define SQLITE_VERSION_NUMBER 3050000
470	#define SQLITE_SOURCE_ID "2025-04-15 21:59:38 d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5"
471
472	/*
473	** CAPI3REF: Run-Time Library Version Numbers
474	** KEYWORDS: sqlite3_version sqlite3_sourceid
475	**
	@@ -485,13 +485,13 @@
485	** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
486	** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
487	** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
488	** </pre></blockquote>)^
489	**
490	** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
491	** macro. ^The sqlite3_libversion() function returns a pointer to the
492	** to the sqlite3_version[] string constant. The sqlite3_libversion()
493	** function is provided for use in DLLs since DLL users usually do not have
494	** direct access to string constants within the DLL. ^The
495	** sqlite3_libversion_number() function returns an integer equal to
496	** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
497	** a pointer to a string constant whose value is the same as the
	@@ -687,11 +687,11 @@
687	** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
688	** that allows an application to run multiple statements of SQL
689	** without having to use a lot of C code.
690	**
691	** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
692	** semicolon-separate SQL statements passed into its 2nd argument,
693	** in the context of the [database connection] passed in as its 1st
694	** argument. ^If the callback function of the 3rd argument to
695	** sqlite3_exec() is not NULL, then it is invoked for each result row
696	** coming out of the evaluated SQL statements. ^The 4th argument to
697	** sqlite3_exec() is relayed through to the 1st argument of each
	@@ -720,11 +720,11 @@
720	** callback is an array of pointers to strings obtained as if from
721	** [sqlite3_column_text()], one for each column. ^If an element of a
722	** result row is NULL then the corresponding string pointer for the
723	** sqlite3_exec() callback is a NULL pointer. ^The 4th argument to the
724	** sqlite3_exec() callback is an array of pointers to strings where each
725	** entry represents the name of corresponding result column as obtained
726	** from [sqlite3_column_name()].
727	**
728	** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
729	** to an empty string, or a pointer that contains only whitespace and/or
730	** SQL comments, then no SQL statements are evaluated and the database
	@@ -906,11 +906,11 @@
906	** Applications should not depend on the historical behavior.
907	**
908	** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
909	** [sqlite3_open_v2()] does not cause the underlying database file
910	** to be opened using O_EXCL. Passing SQLITE_OPEN_EXCLUSIVE into
911	** [sqlite3_open_v2()] has historically be a no-op and might become an
912	** error in future versions of SQLite.
913	*/
914	#define SQLITE_OPEN_READONLY 0x00000001 /* Ok for sqlite3_open_v2() */
915	#define SQLITE_OPEN_READWRITE 0x00000002 /* Ok for sqlite3_open_v2() */
916	#define SQLITE_OPEN_CREATE 0x00000004 /* Ok for sqlite3_open_v2() */
	@@ -1000,11 +1000,11 @@
1000	** CAPI3REF: File Locking Levels
1001	**
1002	** SQLite uses one of these integer values as the second
1003	** argument to calls it makes to the xLock() and xUnlock() methods
1004	** of an [sqlite3_io_methods] object. These values are ordered from
1005	** lest restrictive to most restrictive.
1006	**
1007	** The argument to xLock() is always SHARED or higher. The argument to
1008	** xUnlock is either SHARED or NONE.
1009	*/
1010	#define SQLITE_LOCK_NONE 0 /* xUnlock() only */
	@@ -1316,11 +1316,11 @@
1316	** reason, the entire database file will be overwritten by the current
1317	** transaction. This is used by VACUUM operations.
1318	**
1319	** <li>[[SQLITE_FCNTL_VFSNAME]]
1320	** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
1321	** all [VFSes] in the VFS stack. The names are of all VFS shims and the
1322	** final bottom-level VFS are written into memory obtained from
1323	** [sqlite3_malloc()] and the result is stored in the char* variable
1324	** that the fourth parameter of [sqlite3_file_control()] points to.
1325	** The caller is responsible for freeing the memory when done. As with
1326	** all file-control actions, there is no guarantee that this will actually
	@@ -1330,11 +1330,11 @@
1330	**
1331	** <li>[[SQLITE_FCNTL_VFS_POINTER]]
1332	** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
1333	** [VFSes] currently in use. ^(The argument X in
1334	** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
1335	of type "[sqlite3_vfs] ". This opcodes will set *X
1336	** to a pointer to the top-level VFS.)^
1337	** ^When there are multiple VFS shims in the stack, this opcode finds the
1338	** upper-most shim only.
1339	**
1340	** <li>[[SQLITE_FCNTL_PRAGMA]]
	@@ -1520,11 +1520,11 @@
1520	** record the fact that the pages have been checkpointed.
1521	**
1522	** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
1523	** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
1524	** whether or not there is a database client in another process with a wal-mode
1525	** transaction open on the database or not. It is only available on unix.The
1526	** (void*) argument passed with this file-control should be a pointer to a
1527	** value of type (int). The integer value is set to 1 if the database is a wal
1528	** mode database and there exists at least one client in another process that
1529	** currently has an SQL transaction open on the database. It is set to 0 if
1530	** the database is not a wal-mode db, or if there is no such connection in any
	@@ -1945,11 +1945,11 @@
1945	**
1946	** ^The sqlite3_initialize() routine is called internally by many other
1947	** SQLite interfaces so that an application usually does not need to
1948	** invoke sqlite3_initialize() directly. For example, [sqlite3_open()]
1949	** calls sqlite3_initialize() so the SQLite library will be automatically
1950	** initialized when [sqlite3_open()] is called if it has not be initialized
1951	** already. ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
1952	** compile-time option, then the automatic calls to sqlite3_initialize()
1953	** are omitted and the application must call sqlite3_initialize() directly
1954	** prior to using any other SQLite interface. For maximum portability,
1955	** it is recommended that applications always invoke sqlite3_initialize()
	@@ -2202,25 +2202,25 @@
2202	** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
2203	** is a pointer to an instance of the [sqlite3_mem_methods] structure.
2204	** The [sqlite3_mem_methods]
2205	** structure is filled with the currently defined memory allocation routines.)^
2206	** This option can be used to overload the default memory allocation
2207	** routines with a wrapper that simulations memory allocation failure or
2208	** tracks memory usage, for example. </dd>
2209	**
2210	** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
2211	** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
2212	** type int, interpreted as a boolean, which if true provides a hint to
2213	** SQLite that it should avoid large memory allocations if possible.
2214	** SQLite will run faster if it is free to make large memory allocations,
2215	** but some application might prefer to run slower in exchange for
2216	** guarantees about memory fragmentation that are possible if large
2217	** allocations are avoided. This hint is normally off.
2218	** </dd>
2219	**
2220	** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
2221	** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
2222	** interpreted as a boolean, which enables or disables the collection of
2223	** memory allocation statistics. ^(When memory allocation statistics are
2224	** disabled, the following SQLite interfaces become non-operational:
2225	** <ul>
2226	** <li> [sqlite3_hard_heap_limit64()]
	@@ -2261,11 +2261,11 @@
2261	** a page cache line is larger than sz bytes or if all of the pMem buffer
2262	** is exhausted.
2263	** ^If pMem is NULL and N is non-zero, then each database connection
2264	** does an initial bulk allocation for page cache memory
2265	** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
2266	** of -1024*N bytes if N is negative, . ^If additional
2267	** page cache memory is needed beyond what is provided by the initial
2268	** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
2269	** additional cache line. </dd>
2270	**
2271	** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
	@@ -2290,11 +2290,11 @@
2290	**
2291	** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
2292	** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
2293	** pointer to an instance of the [sqlite3_mutex_methods] structure.
2294	** The argument specifies alternative low-level mutex routines to be used
2295	** in place the mutex routines built into SQLite.)^ ^SQLite makes a copy of
2296	** the content of the [sqlite3_mutex_methods] structure before the call to
2297	** [sqlite3_config()] returns. ^If SQLite is compiled with
2298	** the [SQLITE_THREADSAFE \| SQLITE_THREADSAFE=0] compile-time option then
2299	** the entire mutexing subsystem is omitted from the build and hence calls to
2300	** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
	@@ -2332,11 +2332,11 @@
2332	** the interface to a custom page cache implementation.)^
2333	** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
2334	**
2335	** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
2336	** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
2337	** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies of
2338	** the current page cache implementation into that object.)^ </dd>
2339	**
2340	** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
2341	** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
2342	** global [error log].
	@@ -2349,11 +2349,11 @@
2349	** passed through as the first parameter to the application-defined logger
2350	** function whenever that function is invoked. ^The second parameter to
2351	** the logger function is a copy of the first parameter to the corresponding
2352	** [sqlite3_log()] call and is intended to be a [result code] or an
2353	** [extended result code]. ^The third parameter passed to the logger is
2354	** log message after formatting via [sqlite3_snprintf()].
2355	** The SQLite logging interface is not reentrant; the logger function
2356	** supplied by the application must not invoke any SQLite interface.
2357	** In a multi-threaded application, the application-defined logger
2358	** function must be threadsafe. </dd>
2359	**
	@@ -2540,11 +2540,11 @@
2540	** CAPI3REF: Database Connection Configuration Options
2541	**
2542	** These constants are the available integer configuration options that
2543	** can be passed as the second parameter to the [sqlite3_db_config()] interface.
2544	**
2545	** The [sqlite3_db_config()] interface is a var-args functions. It takes a
2546	** variable number of parameters, though always at least two. The number of
2547	** parameters passed into sqlite3_db_config() depends on which of these
2548	** constants is given as the second parameter. This documentation page
2549	** refers to parameters beyond the second as "arguments". Thus, when this
2550	** page says "the N-th argument" it means "the N-th parameter past the
	@@ -2674,12 +2674,12 @@
2674	** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
2675	** There must be two additional arguments.
2676	** When the first argument to this interface is 1, then only the C-API is
2677	** enabled and the SQL function remains disabled. If the first argument to
2678	** this interface is 0, then both the C-API and the SQL function are disabled.
2679	** If the first argument is -1, then no changes are made to state of either the
2680	** C-API or the SQL function.
2681	** The second parameter is a pointer to an integer into which
2682	** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
2683	** is disabled or enabled following this call. The second parameter may
2684	** be a NULL pointer, in which case the new setting is not reported back.
2685	** </dd>
	@@ -2793,11 +2793,11 @@
2793	** </dd>
2794	**
2795	** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
2796	** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
2797	** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
2798	** the legacy behavior of the [ALTER TABLE RENAME] command such it
2799	** behaves as it did prior to [version 3.24.0] (2018-06-04). See the
2800	** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
2801	** additional information. This feature can also be turned on and off
2802	** using the [PRAGMA legacy_alter_table] statement.
2803	** </dd>
	@@ -2842,11 +2842,11 @@
2842	**
2843	** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
2844	** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
2845	** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
2846	** the legacy file format flag. When activated, this flag causes all newly
2847	** created database file to have a schema format version number (the 4-byte
2848	** integer found at offset 44 into the database header) of 1. This in turn
2849	** means that the resulting database file will be readable and writable by
2850	** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
2851	** newly created databases are generally not understandable by SQLite versions
2852	** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
	@@ -2869,11 +2869,11 @@
2869	** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2870	** statistics. For statistics to be collected, the flag must be set on
2871	** the database handle both when the SQL statement is prepared and when it
2872	** is stepped. The flag is set (collection of statistics is enabled)
2873	** by default. <p>This option takes two arguments: an integer and a pointer to
2874	** an integer.. The first argument is 1, 0, or -1 to enable, disable, or
2875	** leave unchanged the statement scanstatus option. If the second argument
2876	** is not NULL, then the value of the statement scanstatus setting after
2877	** processing the first argument is written into the integer that the second
2878	** argument points to.
2879	** </dd>
	@@ -2912,12 +2912,12 @@
2912	** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
2913	** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
2914	** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
2915	** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
2916	** This capability is enabled by default. Applications can disable or
2917	** reenable this capability using the current DBCONFIG option. If the
2918	** the this capability is disabled, the [ATTACH] command will still work,
2919	** but the database will be opened read-only. If this option is disabled,
2920	** then the ability to create a new database using [ATTACH] is also disabled,
2921	** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
2922	** option.<p>
2923	** This option takes two arguments which are an integer and a pointer
	@@ -2947,11 +2947,11 @@
2947	**
2948	** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
2949	**
2950	** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
2951	** overall call to [sqlite3_db_config()] has a total of four parameters.
2952	** The first argument (the third parameter to sqlite3_db_config()) is a integer.
2953	** The second argument is a pointer to an integer. If the first argument is 1,
2954	** then the option becomes enabled. If the first integer argument is 0, then the
2955	** option is disabled. If the first argument is -1, then the option setting
2956	** is unchanged. The second argument, the pointer to an integer, may be NULL.
2957	** If the second argument is not NULL, then a value of 0 or 1 is written into
	@@ -3237,11 +3237,11 @@
3237	** and comments that follow the final semicolon are ignored.
3238	**
3239	** ^These routines return 0 if the statement is incomplete. ^If a
3240	** memory allocation fails, then SQLITE_NOMEM is returned.
3241	**
3242	** ^These routines do not parse the SQL statements thus
3243	** will not detect syntactically incorrect SQL.
3244	**
3245	** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
3246	** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
3247	** automatically by sqlite3_complete16(). If that initialization fails,
	@@ -3354,11 +3354,11 @@
3354	** Passing 0 to this function disables blocking locks altogether. Passing
3355	** -1 to this function requests that the VFS blocks for a long time -
3356	** indefinitely if possible. The results of passing any other negative value
3357	** are undefined.
3358	**
3359	** Internally, each SQLite database handle store two timeout values - the
3360	** busy-timeout (used for rollback mode databases, or if the VFS does not
3361	** support blocking locks) and the setlk-timeout (used for blocking locks
3362	** on wal-mode databases). The sqlite3_busy_timeout() method sets both
3363	** values, this function sets only the setlk-timeout value. Therefore,
3364	** to configure separate busy-timeout and setlk-timeout values for a single
	@@ -3384,11 +3384,11 @@
3384	** METHOD: sqlite3
3385	**
3386	** This is a legacy interface that is preserved for backwards compatibility.
3387	** Use of this interface is not recommended.
3388	**
3389	** Definition: A <b>result table</b> is memory data structure created by the
3390	** [sqlite3_get_table()] interface. A result table records the
3391	** complete query results from one or more queries.
3392	**
3393	** The table conceptually has a number of rows and columns. But
3394	** these numbers are not part of the result table itself. These
	@@ -3527,11 +3527,11 @@
3527	** of a signed 32-bit integer.
3528	**
3529	** ^Calling sqlite3_free() with a pointer previously returned
3530	** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
3531	** that it might be reused. ^The sqlite3_free() routine is
3532	** a no-op if is called with a NULL pointer. Passing a NULL pointer
3533	** to sqlite3_free() is harmless. After being freed, memory
3534	** should neither be read nor written. Even reading previously freed
3535	** memory might result in a segmentation fault or other severe error.
3536	** Memory corruption, a segmentation fault, or other severe error
3537	** might result if sqlite3_free() is called with a non-NULL pointer that
	@@ -3545,17 +3545,17 @@
3545	** ^If the N parameter to sqlite3_realloc(X,N) is zero or
3546	** negative then the behavior is exactly the same as calling
3547	** sqlite3_free(X).
3548	** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
3549	** of at least N bytes in size or NULL if insufficient memory is available.
3550	** ^If M is the size of the prior allocation, then min(N,M) bytes
3551	** of the prior allocation are copied into the beginning of buffer returned
3552	** by sqlite3_realloc(X,N) and the prior allocation is freed.
3553	** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
3554	** prior allocation is not freed.
3555	**
3556	** ^The sqlite3_realloc64(X,N) interfaces works the same as
3557	** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
3558	** of a 32-bit signed integer.
3559	**
3560	** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
3561	** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
	@@ -3601,11 +3601,11 @@
3601	** ^The [sqlite3_memory_highwater()] routine returns the maximum
3602	** value of [sqlite3_memory_used()] since the high-water mark
3603	** was last reset. ^The values returned by [sqlite3_memory_used()] and
3604	** [sqlite3_memory_highwater()] include any overhead
3605	** added by SQLite in its implementation of [sqlite3_malloc()],
3606	** but not overhead added by the any underlying system library
3607	** routines that [sqlite3_malloc()] may call.
3608	**
3609	** ^The memory high-water mark is reset to the current value of
3610	** [sqlite3_memory_used()] if and only if the parameter to
3611	** [sqlite3_memory_highwater()] is true. ^The value returned
	@@ -4053,19 +4053,19 @@
4053	** attempt to use the same database connection at the same time.
4054	** (Mutexes will block any actual concurrency, but in this mode
4055	** there is no harm in trying.)
4056	**
4057	** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
4058	** <dd>The database is opened [shared cache] enabled, overriding
4059	** the default shared cache setting provided by
4060	** [sqlite3_enable_shared_cache()].)^
4061	** The [use of shared cache mode is discouraged] and hence shared cache
4062	** capabilities may be omitted from many builds of SQLite. In such cases,
4063	** this option is a no-op.
4064	**
4065	** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
4066	** <dd>The database is opened [shared cache] disabled, overriding
4067	** the default shared cache setting provided by
4068	** [sqlite3_enable_shared_cache()].)^
4069	**
4070	** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
4071	** <dd>The database connection comes up in "extended result code mode".
	@@ -4396,11 +4396,11 @@
4396	** These interfaces are provided for use by [VFS shim] implementations and
4397	** are not useful outside of that context.
4398	**
4399	** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
4400	** database filename D with corresponding journal file J and WAL file W and
4401	** with N URI parameters key/values pairs in the array P. The result from
4402	** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
4403	** is safe to pass to routines like:
4404	** <ul>
4405	** <li> [sqlite3_uri_parameter()],
4406	** <li> [sqlite3_uri_boolean()],
	@@ -4479,19 +4479,19 @@
4479	** The application does not need to worry about freeing the result.
4480	** However, the error string might be overwritten or deallocated by
4481	** subsequent calls to other SQLite interface functions.)^
4482	**
4483	** ^The sqlite3_errstr(E) interface returns the English-language text
4484	** that describes the [result code] E, as UTF-8, or NULL if E is not an
4485	** result code for which a text error message is available.
4486	** ^(Memory to hold the error message string is managed internally
4487	** and must not be freed by the application)^.
4488	**
4489	** ^If the most recent error references a specific token in the input
4490	** SQL, the sqlite3_error_offset() interface returns the byte offset
4491	** of the start of that token. ^The byte offset returned by
4492	** sqlite3_error_offset() assumes that the input SQL is UTF8.
4493	** ^If the most recent error does not reference a specific token in the input
4494	** SQL, then the sqlite3_error_offset() function returns -1.
4495	**
4496	** When the serialized [threading mode] is in use, it might be the
4497	** case that a second error occurs on a separate thread in between
	@@ -4586,12 +4586,12 @@
4586	** CAPI3REF: Run-Time Limit Categories
4587	** KEYWORDS: {limit category} {*limit categories}
4588	**
4589	** These constants define various performance limits
4590	** that can be lowered at run-time using [sqlite3_limit()].
4591	** The synopsis of the meanings of the various limits is shown below.
4592	** Additional information is available at [limits \| Limits in SQLite].
4593	**
4594	** <dl>
4595	** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
4596	** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
4597	**
	@@ -4652,11 +4652,11 @@
4652	#define SQLITE_LIMIT_WORKER_THREADS 11
4653
4654	/*
4655	** CAPI3REF: Prepare Flags
4656	**
4657	** These constants define various flags that can be passed into
4658	** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
4659	** [sqlite3_prepare16_v3()] interfaces.
4660	**
4661	** New flags may be added in future releases of SQLite.
4662	**
	@@ -4739,11 +4739,11 @@
4739	** statement is generated.
4740	** If the caller knows that the supplied string is nul-terminated, then
4741	** there is a small performance advantage to passing an nByte parameter that
4742	** is the number of bytes in the input string <i>including</i>
4743	** the nul-terminator.
4744	** Note that nByte measure the length of the input in bytes, not
4745	** characters, even for the UTF-16 interfaces.
4746	**
4747	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
4748	** past the end of the first SQL statement in zSql. These routines only
4749	** compile the first statement in zSql, so *pzTail is left pointing to
	@@ -4873,11 +4873,11 @@
4873	** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
4874	** will return "SELECT 2345,NULL".)^
4875	**
4876	** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
4877	** is available to hold the result, or if the result would exceed the
4878	** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
4879	**
4880	** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
4881	** bound parameter expansions. ^The [SQLITE_OMIT_TRACE] compile-time
4882	** option causes sqlite3_expanded_sql() to always return NULL.
4883	**
	@@ -5061,11 +5061,11 @@
5061	/*
5062	** CAPI3REF: SQL Function Context Object
5063	**
5064	** The context in which an SQL function executes is stored in an
5065	** sqlite3_context object. ^A pointer to an sqlite3_context object
5066	** is always first parameter to [application-defined SQL functions].
5067	** The application-defined SQL function implementation will pass this
5068	** pointer through into calls to [sqlite3_result_int \| sqlite3_result()],
5069	** [sqlite3_aggregate_context()], [sqlite3_user_data()],
5070	** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
5071	** and/or [sqlite3_set_auxdata()].
	@@ -5077,11 +5077,11 @@
5077	** KEYWORDS: {host parameter} {host parameters} {host parameter name}
5078	** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
5079	** METHOD: sqlite3_stmt
5080	**
5081	** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
5082	** literals may be replaced by a [parameter] that matches one of following
5083	** templates:
5084	**
5085	** <ul>
5086	** <li> ?
5087	** <li> ?NNN
	@@ -5122,11 +5122,11 @@
5122	** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
5123	** otherwise.
5124	**
5125	** [[byte-order determination rules]] ^The byte-order of
5126	** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
5127	** found in first character, which is removed, or in the absence of a BOM
5128	** the byte order is the native byte order of the host
5129	** machine for sqlite3_bind_text16() or the byte order specified in
5130	** the 6th parameter for sqlite3_bind_text64().)^
5131	** ^If UTF16 input text contains invalid unicode
5132	** characters, then SQLite might change those invalid characters
	@@ -5142,11 +5142,11 @@
5142	** the behavior is undefined.
5143	** If a non-negative fourth parameter is provided to sqlite3_bind_text()
5144	** or sqlite3_bind_text16() or sqlite3_bind_text64() then
5145	** that parameter must be the byte offset
5146	** where the NUL terminator would occur assuming the string were NUL
5147	** terminated. If any NUL characters occurs at byte offsets less than
5148	** the value of the fourth parameter then the resulting string value will
5149	** contain embedded NULs. The result of expressions involving strings
5150	** with embedded NULs is undefined.
5151	**
5152	** ^The fifth argument to the BLOB and string binding interfaces controls
	@@ -5354,11 +5354,11 @@
5354	/*
5355	** CAPI3REF: Source Of Data In A Query Result
5356	** METHOD: sqlite3_stmt
5357	**
5358	** ^These routines provide a means to determine the database, table, and
5359	** table column that is the origin of a particular result column in
5360	** [SELECT] statement.
5361	** ^The name of the database or table or column can be returned as
5362	** either a UTF-8 or UTF-16 string. ^The _database_ routines return
5363	** the database name, the _table_ routines return the table name, and
5364	** the origin_ routines return the column name.
	@@ -5798,11 +5798,11 @@
5798	** CAPI3REF: Destroy A Prepared Statement Object
5799	** DESTRUCTOR: sqlite3_stmt
5800	**
5801	** ^The sqlite3_finalize() function is called to delete a [prepared statement].
5802	** ^If the most recent evaluation of the statement encountered no errors
5803	** or if the statement is never been evaluated, then sqlite3_finalize() returns
5804	** SQLITE_OK. ^If the most recent evaluation of statement S failed, then
5805	** sqlite3_finalize(S) returns the appropriate [error code] or
5806	** [extended error code].
5807	**
5808	** ^The sqlite3_finalize(S) routine can be called at any point during
	@@ -5923,12 +5923,12 @@
5923	** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
5924	** index expressions, or the WHERE clause of partial indexes.
5925	**
5926	** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
5927	** all application-defined SQL functions that do not need to be
5928	** used inside of triggers, view, CHECK constraints, or other elements of
5929	** the database schema. This flags is especially recommended for SQL
5930	** functions that have side effects or reveal internal application state.
5931	** Without this flag, an attacker might be able to modify the schema of
5932	** a database file to include invocations of the function with parameters
5933	** chosen by the attacker, which the application will then execute when
5934	** the database file is opened and read.
	@@ -5955,11 +5955,11 @@
5955	** or aggregate window function. More details regarding the implementation
5956	** of aggregate window functions are
5957	** [user-defined window functions\|available here].
5958	**
5959	** ^(If the final parameter to sqlite3_create_function_v2() or
5960	** sqlite3_create_window_function() is not NULL, then it is destructor for
5961	** the application data pointer. The destructor is invoked when the function
5962	** is deleted, either by being overloaded or when the database connection
5963	** closes.)^ ^The destructor is also invoked if the call to
5964	** sqlite3_create_function_v2() fails. ^When the destructor callback is
5965	** invoked, it is passed a single argument which is a copy of the application
	@@ -6030,11 +6030,11 @@
6030	);
6031
6032	/*
6033	** CAPI3REF: Text Encodings
6034	**
6035	** These constant define integer codes that represent the various
6036	** text encodings supported by SQLite.
6037	*/
6038	#define SQLITE_UTF8 1 /* IMP: R-37514-35566 */
6039	#define SQLITE_UTF16LE 2 /* IMP: R-03371-37637 */
6040	#define SQLITE_UTF16BE 3 /* IMP: R-51971-34154 */
	@@ -6122,11 +6122,11 @@
6122	** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
6123	** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
6124	** result.
6125	** Every function that invokes [sqlite3_result_subtype()] should have this
6126	** property. If it does not, then the call to [sqlite3_result_subtype()]
6127	** might become a no-op if the function is used as term in an
6128	** [expression index]. On the other hand, SQL functions that never invoke
6129	** [sqlite3_result_subtype()] should avoid setting this property, as the
6130	** purpose of this property is to disable certain optimizations that are
6131	** incompatible with subtypes.
6132	**
	@@ -6249,11 +6249,11 @@
6249	**
6250	** ^Within the [xUpdate] method of a [virtual table], the
6251	** sqlite3_value_nochange(X) interface returns true if and only if
6252	** the column corresponding to X is unchanged by the UPDATE operation
6253	** that the xUpdate method call was invoked to implement and if
6254	** and the prior [xColumn] method call that was invoked to extracted
6255	** the value for that column returned without setting a result (probably
6256	** because it queried [sqlite3_vtab_nochange()] and found that the column
6257	** was unchanging). ^Within an [xUpdate] method, any value for which
6258	** sqlite3_value_nochange(X) is true will in all other respects appear
6259	** to be a NULL value. If sqlite3_value_nochange(X) is invoked anywhere other
	@@ -6355,11 +6355,11 @@
6355	/*
6356	** CAPI3REF: Copy And Free SQL Values
6357	** METHOD: sqlite3_value
6358	**
6359	** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
6360	** object D and returns a pointer to that copy. ^The [sqlite3_value] returned
6361	** is a [protected sqlite3_value] object even if the input is not.
6362	** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
6363	** memory allocation fails. ^If V is a [pointer value], then the result
6364	** of sqlite3_value_dup(V) is a NULL value.
6365	**
	@@ -6393,11 +6393,11 @@
6393	** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
6394	** when first called if N is less than or equal to zero or if a memory
6395	** allocation error occurs.
6396	**
6397	** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
6398	** determined by the N parameter on first successful call. Changing the
6399	** value of N in any subsequent call to sqlite3_aggregate_context() within
6400	** the same aggregate function instance will not resize the memory
6401	** allocation.)^ Within the xFinal callback, it is customary to set
6402	** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
6403	** pointless memory allocations occur.
	@@ -6555,11 +6555,11 @@
6555	** of as a secret key such that only code that knows the secret key is able
6556	** to access the associated data.
6557	**
6558	** Security Warning: These interfaces should not be exposed in scripting
6559	** languages or in other circumstances where it might be possible for an
6560	** an attacker to invoke them. Any agent that can invoke these interfaces
6561	** can probably also take control of the process.
6562	**
6563	** Database connection client data is only available for SQLite
6564	** version 3.44.0 ([dateof:3.44.0]) and later.
6565	**
	@@ -6669,11 +6669,11 @@
6669	** ^If the 3rd parameter to the sqlite3_result_text* interfaces
6670	** is non-negative, then as many bytes (not characters) of the text
6671	** pointed to by the 2nd parameter are taken as the application-defined
6672	** function result. If the 3rd parameter is non-negative, then it
6673	** must be the byte offset into the string where the NUL terminator would
6674	** appear if the string where NUL terminated. If any NUL characters occur
6675	** in the string at a byte offset that is less than the value of the 3rd
6676	** parameter, then the resulting string will contain embedded NULs and the
6677	** result of expressions operating on strings with embedded NULs is undefined.
6678	** ^If the 4th parameter to the sqlite3_result_text* interfaces
6679	** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
	@@ -6727,11 +6727,11 @@
6727	** for the P parameter. ^SQLite invokes D with P as its only argument
6728	** when SQLite is finished with P. The T parameter should be a static
6729	** string and preferably a string literal. The sqlite3_result_pointer()
6730	** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
6731	**
6732	** If these routines are called from within the different thread
6733	** than the one containing the application-defined function that received
6734	** the [sqlite3_context] pointer, the results are undefined.
6735	*/
6736	SQLITE_API void sqlite3_result_blob(sqlite3_context, const void, int, void()(void));
6737	SQLITE_API void sqlite3_result_blob64(sqlite3_context,const void,
	@@ -7133,11 +7133,11 @@
7133	/*
7134	** CAPI3REF: Return The Schema Name For A Database Connection
7135	** METHOD: sqlite3
7136	**
7137	** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
7138	** for the N-th database on database connection D, or a NULL pointer of N is
7139	** out of range. An N value of 0 means the main database file. An N of 1 is
7140	** the "temp" schema. Larger values of N correspond to various ATTACH-ed
7141	** databases.
7142	**
7143	** Space to hold the string that is returned by sqlite3_db_name() is managed
	@@ -7228,20 +7228,20 @@
7228	**
7229	** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
7230	** <dd>The SQLITE_TXN_READ state means that the database is currently
7231	** in a read transaction. Content has been read from the database file
7232	** but nothing in the database file has changed. The transaction state
7233	** will advanced to SQLITE_TXN_WRITE if any changes occur and there are
7234	** no other conflicting concurrent write transactions. The transaction
7235	** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
7236	** [COMMIT].</dd>
7237	**
7238	** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
7239	** <dd>The SQLITE_TXN_WRITE state means that the database is currently
7240	** in a write transaction. Content has been written to the database file
7241	** but has not yet committed. The transaction state will change to
7242	** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
7243	*/
7244	#define SQLITE_TXN_NONE 0
7245	#define SQLITE_TXN_READ 1
7246	#define SQLITE_TXN_WRITE 2
7247
	@@ -7518,11 +7518,11 @@
7518
7519	/*
7520	** CAPI3REF: Impose A Limit On Heap Size
7521	**
7522	** These interfaces impose limits on the amount of heap memory that will be
7523	** by all database connections within a single process.
7524	**
7525	** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
7526	** soft limit on the amount of heap memory that may be allocated by SQLite.
7527	** ^SQLite strives to keep heap memory utilization below the soft heap
7528	** limit by reducing the number of pages held in the page cache
	@@ -7576,11 +7576,11 @@
7576	** by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
7577	** from the heap.
7578	** </ul>)^
7579	**
7580	** The circumstances under which SQLite will enforce the heap limits may
7581	** changes in future releases of SQLite.
7582	*/
7583	SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
7584	SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
7585
7586	/*
	@@ -7691,12 +7691,12 @@
7691	** be tried also.
7692	**
7693	** ^The entry point is zProc.
7694	** ^(zProc may be 0, in which case SQLite will try to come up with an
7695	** entry point name on its own. It first tries "sqlite3_extension_init".
7696	** If that does not work, it constructs a name "sqlite3_X_init" where the
7697	** X is consists of the lower-case equivalent of all ASCII alphabetic
7698	** characters in the filename from the last "/" to the first following
7699	** "." and omitting any initial "lib".)^
7700	** ^The sqlite3_load_extension() interface returns
7701	** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
7702	** ^If an error occurs and pzErrMsg is not 0, then the
	@@ -7763,11 +7763,11 @@
7763	** that is to be automatically loaded into all new database connections.
7764	**
7765	** ^(Even though the function prototype shows that xEntryPoint() takes
7766	** no arguments and returns void, SQLite invokes xEntryPoint() with three
7767	** arguments and expects an integer result as if the signature of the
7768	** entry point where as follows:
7769	**
7770	** <blockquote><pre>
7771	**   int xEntryPoint(
7772	**   sqlite3 *db,
7773	const char pzErrMsg,
	@@ -7927,11 +7927,11 @@
7927	** and becomes the argvIndex-th entry in argv. ^(If aConstraintUsage[].omit
7928	** is true, then the constraint is assumed to be fully handled by the
7929	** virtual table and might not be checked again by the byte code.)^ ^(The
7930	** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
7931	** is left in its default setting of false, the constraint will always be
7932	** checked separately in byte code. If the omit flag is change to true, then
7933	** the constraint may or may not be checked in byte code. In other words,
7934	** when the omit flag is true there is no guarantee that the constraint will
7935	** not be checked again using byte code.)^
7936	**
7937	** ^The idxNum and idxStr values are recorded and passed into the
	@@ -7953,11 +7953,11 @@
7953	** will be returned by the strategy.
7954	**
7955	** The xBestIndex method may optionally populate the idxFlags field with a
7956	** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
7957	** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
7958	** output to show the idxNum has hex instead of as decimal. Another flag is
7959	** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
7960	** return at most one row.
7961	**
7962	** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
7963	** SQLite also assumes that if a call to the xUpdate() method is made as
	@@ -8094,11 +8094,11 @@
8094	** by the first parameter. ^The name of the module is given by the
8095	** second parameter. ^The third parameter is a pointer to
8096	** the implementation of the [virtual table module]. ^The fourth
8097	** parameter is an arbitrary client data pointer that is passed through
8098	** into the [xCreate] and [xConnect] methods of the virtual table module
8099	** when a new virtual table is be being created or reinitialized.
8100	**
8101	** ^The sqlite3_create_module_v2() interface has a fifth parameter which
8102	** is a pointer to a destructor for the pClientData. ^SQLite will
8103	** invoke the destructor function (if it is not NULL) when SQLite
8104	** no longer needs the pClientData pointer. ^The destructor will also
	@@ -8259,11 +8259,11 @@
8259	**
8260	** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
8261	** in *ppBlob. Otherwise an [error code] is returned and, unless the error
8262	** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
8263	** the API is not misused, it is always safe to call [sqlite3_blob_close()]
8264	** on *ppBlob after this function it returns.
8265	**
8266	** This function fails with SQLITE_ERROR if any of the following are true:
8267	** <ul>
8268	** <li> ^(Database zDb does not exist)^,
8269	** <li> ^(Table zTable does not exist within database zDb)^,
	@@ -8379,11 +8379,11 @@
8379	** CAPI3REF: Return The Size Of An Open BLOB
8380	** METHOD: sqlite3_blob
8381	**
8382	** ^Returns the size in bytes of the BLOB accessible via the
8383	** successfully opened [BLOB handle] in its only argument. ^The
8384	** incremental blob I/O routines can only read or overwriting existing
8385	** blob content; they cannot change the size of a blob.
8386	**
8387	** This routine only works on a [BLOB handle] which has been created
8388	** by a prior successful call to [sqlite3_blob_open()] and which has not
8389	** been closed by [sqlite3_blob_close()]. Passing any other pointer in
	@@ -8529,11 +8529,11 @@
8529	** function that calls sqlite3_initialize().
8530	**
8531	** ^The sqlite3_mutex_alloc() routine allocates a new
8532	** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
8533	** routine returns NULL if it is unable to allocate the requested
8534	** mutex. The argument to sqlite3_mutex_alloc() must one of these
8535	** integer constants:
8536	**
8537	** <ul>
8538	** <li> SQLITE_MUTEX_FAST
8539	** <li> SQLITE_MUTEX_RECURSIVE
	@@ -8762,11 +8762,11 @@
8762
8763	/*
8764	** CAPI3REF: Retrieve the mutex for a database connection
8765	** METHOD: sqlite3
8766	**
8767	** ^This interface returns a pointer the [sqlite3_mutex] object that
8768	** serializes access to the [database connection] given in the argument
8769	** when the [threading mode] is Serialized.
8770	** ^If the [threading mode] is Single-thread or Multi-thread then this
8771	** routine returns a NULL pointer.
8772	*/
	@@ -8885,11 +8885,11 @@
8885
8886	/*
8887	** CAPI3REF: SQL Keyword Checking
8888	**
8889	** These routines provide access to the set of SQL language keywords
8890	** recognized by SQLite. Applications can uses these routines to determine
8891	** whether or not a specific identifier needs to be escaped (for example,
8892	** by enclosing in double-quotes) so as not to confuse the parser.
8893	**
8894	** The sqlite3_keyword_count() interface returns the number of distinct
8895	** keywords understood by SQLite.
	@@ -9053,11 +9053,11 @@
9053	**
9054	** ^The [sqlite3_str_value(X)] method returns a pointer to the current
9055	** content of the dynamic string under construction in X. The value
9056	** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
9057	** and might be freed or altered by any subsequent method on the same
9058	** [sqlite3_str] object. Applications must not used the pointer returned
9059	** [sqlite3_str_value(X)] after any subsequent method call on the same
9060	** object. ^Applications may change the content of the string returned
9061	** by [sqlite3_str_value(X)] as long as they do not write into any bytes
9062	** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
9063	** write any byte after any subsequent sqlite3_str method call.
	@@ -9139,11 +9139,11 @@
9139	** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
9140	** <dd>This parameter returns the number of bytes of page cache
9141	** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
9142	** buffer and where forced to overflow to [sqlite3_malloc()]. The
9143	** returned value includes allocations that overflowed because they
9144	** where too large (they were larger than the "sz" parameter to
9145	** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
9146	** no space was left in the page cache.</dd>)^
9147	**
9148	** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
9149	** <dd>This parameter records the largest memory allocation request
	@@ -9223,53 +9223,55 @@
9223	** checked out.</dd>)^
9224	**
9225	** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
9226	** <dd>This parameter returns the number of malloc attempts that were
9227	** satisfied using lookaside memory. Only the high-water value is meaningful;
9228	** the current value is always zero.)^
9229	**
9230	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
9231	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
9232	** <dd>This parameter returns the number malloc attempts that might have
9233	** been satisfied using lookaside memory but failed due to the amount of
9234	** memory requested being larger than the lookaside slot size.
9235	** Only the high-water value is meaningful;
9236	** the current value is always zero.)^
9237	**
9238	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
9239	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
9240	** <dd>This parameter returns the number malloc attempts that might have
9241	** been satisfied using lookaside memory but failed due to all lookaside
9242	** memory already being in use.
9243	** Only the high-water value is meaningful;
9244	** the current value is always zero.)^
9245	**
9246	** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
9247	** <dd>This parameter returns the approximate number of bytes of heap
9248	** memory used by all pager caches associated with the database connection.)^
9249	** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.

9250	**
9251	** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
9252	** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
9253	** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
9254	** pager cache is shared between two or more connections the bytes of heap
9255	** memory used by that pager cache is divided evenly between the attached
9256	** connections.)^ In other words, if none of the pager caches associated
9257	** with the database connection are shared, this request returns the same
9258	** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are
9259	** shared, the value returned by this call will be smaller than that returned
9260	** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
9261	** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.
9262	**
9263	** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
9264	** <dd>This parameter returns the approximate number of bytes of heap
9265	** memory used to store the schema for all databases associated
9266	** with the connection - main, temp, and any [ATTACH]-ed databases.)^
9267	** ^The full amount of memory used by the schemas is reported, even if the
9268	** schema memory is shared with other database connections due to
9269	** [shared cache mode] being enabled.
9270	** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.

9271	**
9272	** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
9273	** <dd>This parameter returns the approximate number of bytes of heap
9274	** and lookaside memory used by all prepared statements associated with
9275	** the database connection.)^
	@@ -9302,11 +9304,11 @@
9302	** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
9303	** <dd>This parameter returns the number of dirty cache entries that have
9304	** been written to disk in the middle of a transaction due to the page
9305	** cache overflowing. Transactions are more efficient if they are written
9306	** to disk all at once. When pages spill mid-transaction, that introduces
9307	** additional overhead. This parameter can be used help identify
9308	** inefficiencies that can be resolved by increasing the cache size.
9309	** </dd>
9310	**
9311	** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
9312	** <dd>This parameter returns zero for the current value if and only if
	@@ -9373,48 +9375,48 @@
9373	** careful use of indices.</dd>
9374	**
9375	** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
9376	** <dd>^This is the number of sort operations that have occurred.
9377	** A non-zero value in this counter may indicate an opportunity to
9378	** improvement performance through careful use of indices.</dd>
9379	**
9380	** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
9381	** <dd>^This is the number of rows inserted into transient indices that
9382	** were created automatically in order to help joins run faster.
9383	** A non-zero value in this counter may indicate an opportunity to
9384	** improvement performance by adding permanent indices that do not
9385	** need to be reinitialized each time the statement is run.</dd>
9386	**
9387	** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
9388	** <dd>^This is the number of virtual machine operations executed
9389	** by the prepared statement if that number is less than or equal
9390	** to 2147483647. The number of virtual machine operations can be
9391	** used as a proxy for the total work done by the prepared statement.
9392	** If the number of virtual machine operations exceeds 2147483647
9393	** then the value returned by this statement status code is undefined.
9394	**
9395	** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
9396	** <dd>^This is the number of times that the prepare statement has been
9397	** automatically regenerated due to schema changes or changes to
9398	** [bound parameters] that might affect the query plan.
9399	**
9400	** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
9401	** <dd>^This is the number of times that the prepared statement has
9402	** been run. A single "run" for the purposes of this counter is one
9403	** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
9404	** The counter is incremented on the first [sqlite3_step()] call of each
9405	** cycle.
9406	**
9407	** [[SQLITE_STMTSTATUS_FILTER_MISS]]
9408	** [[SQLITE_STMTSTATUS_FILTER HIT]]
9409	** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
9410	** SQLITE_STMTSTATUS_FILTER_MISS</dt>
9411	** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
9412	** step was bypassed because a Bloom filter returned not-found. The
9413	** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
9414	** times that the Bloom filter returned a find, and thus the join step
9415	** had to be processed as normal.
9416	**
9417	** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
9418	** <dd>^This is the approximate number of bytes of heap memory
9419	** used to store the prepared statement. ^This value is not actually
9420	** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
	@@ -9515,31 +9517,31 @@
9515	** [[the xCreate() page cache methods]]
9516	** ^SQLite invokes the xCreate() method to construct a new cache instance.
9517	** SQLite will typically create one cache instance for each open database file,
9518	** though this is not guaranteed. ^The
9519	** first parameter, szPage, is the size in bytes of the pages that must
9520	** be allocated by the cache. ^szPage will always a power of two. ^The
9521	** second parameter szExtra is a number of bytes of extra storage
9522	** associated with each page cache entry. ^The szExtra parameter will
9523	** a number less than 250. SQLite will use the
9524	** extra szExtra bytes on each page to store metadata about the underlying
9525	** database page on disk. The value passed into szExtra depends
9526	** on the SQLite version, the target platform, and how SQLite was compiled.
9527	** ^The third argument to xCreate(), bPurgeable, is true if the cache being
9528	** created will be used to cache database pages of a file stored on disk, or
9529	** false if it is used for an in-memory database. The cache implementation
9530	** does not have to do anything special based with the value of bPurgeable;
9531	** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
9532	** never invoke xUnpin() except to deliberately delete a page.
9533	** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
9534	** false will always have the "discard" flag set to true.
9535	** ^Hence, a cache created with bPurgeable false will
9536	** never contain any unpinned pages.
9537	**
9538	** [[the xCachesize() page cache method]]
9539	** ^(The xCachesize() method may be called at any time by SQLite to set the
9540	** suggested maximum cache-size (number of pages stored by) the cache
9541	** instance passed as the first argument. This is the value configured using
9542	** the SQLite "[PRAGMA cache_size]" command.)^ As with the bPurgeable
9543	** parameter, the implementation is not required to do anything with this
9544	** value; it is advisory only.
9545	**
	@@ -9562,16 +9564,16 @@
9562	**
9563	** If the requested page is already in the page cache, then the page cache
9564	** implementation must return a pointer to the page buffer with its content
9565	** intact. If the requested page is not already in the cache, then the
9566	** cache implementation should use the value of the createFlag
9567	** parameter to help it determined what action to take:
9568	**
9569	** <table border=1 width=85% align=center>
9570	** <tr><th> createFlag <th> Behavior when page is not already in cache
9571	** <tr><td> 0 <td> Do not allocate a new page. Return NULL.
9572	** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
9573	** Otherwise return NULL.
9574	** <tr><td> 2 <td> Make every effort to allocate a new page. Only return
9575	** NULL if allocating a new page is effectively impossible.
9576	** </table>
9577	**
	@@ -9584,11 +9586,11 @@
9584	** [[the xUnpin() page cache method]]
9585	** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
9586	** as its second argument. If the third parameter, discard, is non-zero,
9587	** then the page must be evicted from the cache.
9588	** ^If the discard parameter is
9589	** zero, then the page may be discarded or retained at the discretion of
9590	** page cache implementation. ^The page cache implementation
9591	** may choose to evict unpinned pages at any time.
9592	**
9593	** The cache must not perform any reference counting. A single
9594	** call to xUnpin() unpins the page regardless of the number of prior calls
	@@ -9602,11 +9604,11 @@
9602	** to be pinned.
9603	**
9604	** When SQLite calls the xTruncate() method, the cache must discard all
9605	** existing cache entries with page numbers (keys) greater than or equal
9606	** to the value of the iLimit parameter passed to xTruncate(). If any
9607	** of these pages are pinned, they are implicitly unpinned, meaning that
9608	** they can be safely discarded.
9609	**
9610	** [[the xDestroy() page cache method]]
9611	** ^The xDestroy() method is used to delete a cache allocated by xCreate().
9612	** All resources associated with the specified cache should be freed. ^After
	@@ -9782,11 +9784,11 @@
9782	** sqlite3_backup_step(), the source database may be modified mid-way
9783	** through the backup process. ^If the source database is modified by an
9784	** external process or via a database connection other than the one being
9785	** used by the backup operation, then the backup will be automatically
9786	** restarted by the next call to sqlite3_backup_step(). ^If the source
9787	** database is modified by the using the same database connection as is used
9788	** by the backup operation, then the backup database is automatically
9789	** updated at the same time.
9790	**
9791	** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
9792	**
	@@ -9799,11 +9801,11 @@
9799	** active write-transaction on the destination database is rolled back.
9800	** The [sqlite3_backup] object is invalid
9801	** and may not be used following a call to sqlite3_backup_finish().
9802	**
9803	** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
9804	** sqlite3_backup_step() errors occurred, regardless or whether or not
9805	** sqlite3_backup_step() completed.
9806	** ^If an out-of-memory condition or IO error occurred during any prior
9807	** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
9808	** sqlite3_backup_finish() returns the corresponding [error code].
9809	**
	@@ -9901,11 +9903,11 @@
9901	** identity of the database connection (the blocking connection) that
9902	** has locked the required resource is stored internally. ^After an
9903	** application receives an SQLITE_LOCKED error, it may call the
9904	** sqlite3_unlock_notify() method with the blocked connection handle as
9905	** the first argument to register for a callback that will be invoked
9906	** when the blocking connections current transaction is concluded. ^The
9907	** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
9908	** call that concludes the blocking connection's transaction.
9909	**
9910	** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
9911	** there is a chance that the blocking connection will have already
	@@ -9921,11 +9923,11 @@
9921	** ^(There may be at most one unlock-notify callback registered by a
9922	** blocked connection. If sqlite3_unlock_notify() is called when the
9923	** blocked connection already has a registered unlock-notify callback,
9924	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
9925	** called with a NULL pointer as its second argument, then any existing
9926	** unlock-notify callback is canceled. ^The blocked connections
9927	** unlock-notify callback may also be canceled by closing the blocked
9928	** connection using [sqlite3_close()].
9929	**
9930	** The unlock-notify callback is not reentrant. If an application invokes
9931	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -10319,11 +10321,11 @@
10319	** where X is an integer. If X is zero, then the [virtual table] whose
10320	** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
10321	** support constraints. In this configuration (which is the default) if
10322	** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
10323	** statement is rolled back as if [ON CONFLICT \| OR ABORT] had been
10324	** specified as part of the users SQL statement, regardless of the actual
10325	** ON CONFLICT mode specified.
10326	**
10327	** If X is non-zero, then the virtual table implementation guarantees
10328	** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
10329	** any modifications to internal or persistent data structures have been made.
	@@ -10353,11 +10355,11 @@
10353	** </dd>
10354	**
10355	** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
10356	** <dd>Calls of the form
10357	** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
10358	** the [xConnect] or [xCreate] methods of a [virtual table] implementation
10359	** identify that virtual table as being safe to use from within triggers
10360	** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
10361	** virtual table can do no serious harm even if it is controlled by a
10362	** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
10363	** flag unless absolutely necessary.
	@@ -10521,21 +10523,21 @@
10521	** <tr><td>2<td>no<td>yes<td>yes
10522	** <tr><td>3<td>yes<td>yes<td>yes
10523	** </table>
10524	**
10525	** ^For the purposes of comparing virtual table output values to see if the
10526	** values are same value for sorting purposes, two NULL values are considered
10527	** to be the same. In other words, the comparison operator is "IS"
10528	** (or "IS NOT DISTINCT FROM") and not "==".
10529	**
10530	** If a virtual table implementation is unable to meet the requirements
10531	** specified above, then it must not set the "orderByConsumed" flag in the
10532	** [sqlite3_index_info] object or an incorrect answer may result.
10533	**
10534	** ^A virtual table implementation is always free to return rows in any order
10535	** it wants, as long as the "orderByConsumed" flag is not set. ^When the
10536	** the "orderByConsumed" flag is unset, the query planner will add extra
10537	** [bytecode] to ensure that the final results returned by the SQL query are
10538	** ordered correctly. The use of the "orderByConsumed" flag and the
10539	** sqlite3_vtab_distinct() interface is merely an optimization. ^Careful
10540	** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
10541	** flag might help queries against a virtual table to run faster. Being
	@@ -10628,11 +10630,11 @@
10628	**
10629	** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
10630	** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
10631	** xFilter method which invokes these routines, and specifically
10632	** a parameter that was previously selected for all-at-once IN constraint
10633	** processing use the [sqlite3_vtab_in()] interface in the
10634	** [xBestIndex\|xBestIndex method]. ^(If the X parameter is not
10635	** an xFilter argument that was selected for all-at-once IN constraint
10636	** processing, then these routines return [SQLITE_ERROR].)^
10637	**
10638	** ^(Use these routines to access all values on the right-hand side
	@@ -10683,11 +10685,11 @@
10683	** right-hand operand is not known, then *V is set to a NULL pointer.
10684	** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
10685	** and only if *V is set to a value. ^The sqlite3_vtab_rhs_value(P,J,V)
10686	** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
10687	** constraint is not available. ^The sqlite3_vtab_rhs_value() interface
10688	** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
10689	** something goes wrong.
10690	**
10691	** The sqlite3_vtab_rhs_value() interface is usually only successful if
10692	** the right-hand operand of a constraint is a literal value in the original
10693	** SQL statement. If the right-hand operand is an expression or a reference
	@@ -10711,12 +10713,12 @@
10711	/*
10712	** CAPI3REF: Conflict resolution modes
10713	** KEYWORDS: {conflict resolution mode}
10714	**
10715	** These constants are returned by [sqlite3_vtab_on_conflict()] to
10716	** inform a [virtual table] implementation what the [ON CONFLICT] mode
10717	** is for the SQL statement being evaluated.
10718	**
10719	** Note that the [SQLITE_IGNORE] constant is also used as a potential
10720	** return value from the [sqlite3_set_authorizer()] callback and that
10721	** [SQLITE_ABORT] is also a [result code].
10722	*/
	@@ -10752,43 +10754,43 @@
10752	** to the total number of rows examined by all iterations of the X-th loop.</dd>
10753	**
10754	** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
10755	** <dd>^The "double" variable pointed to by the V parameter will be set to the
10756	** query planner's estimate for the average number of rows output from each
10757	** iteration of the X-th loop. If the query planner's estimates was accurate,
10758	** then this value will approximate the quotient NVISIT/NLOOP and the
10759	** product of this value for all prior loops with the same SELECTID will
10760	** be the NLOOP value for the current loop.
10761	**
10762	** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
10763	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10764	** to a zero-terminated UTF-8 string containing the name of the index or table
10765	** used for the X-th loop.
10766	**
10767	** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
10768	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10769	** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
10770	** description for the X-th loop.
10771	**
10772	** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
10773	** <dd>^The "int" variable pointed to by the V parameter will be set to the
10774	** id for the X-th query plan element. The id value is unique within the
10775	** statement. The select-id is the same value as is output in the first
10776	** column of an [EXPLAIN QUERY PLAN] query.
10777	**
10778	** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
10779	** <dd>The "int" variable pointed to by the V parameter will be set to the
10780	** the id of the parent of the current query element, if applicable, or
10781	** to zero if the query element has no parent. This is the same value as
10782	** returned in the second column of an [EXPLAIN QUERY PLAN] query.
10783	**
10784	** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
10785	** <dd>The sqlite3_int64 output value is set to the number of cycles,
10786	** according to the processor time-stamp counter, that elapsed while the
10787	** query element was being processed. This value is not available for
10788	** all query elements - if it is unavailable the output variable is
10789	** set to -1.
10790	** </dl>
10791	*/
10792	#define SQLITE_SCANSTAT_NLOOP 0
10793	#define SQLITE_SCANSTAT_NVISIT 1
10794	#define SQLITE_SCANSTAT_EST 2
	@@ -10825,12 +10827,12 @@
10825	** the EXPLAIN QUERY PLAN output) are available. Invoking API
10826	** sqlite3_stmt_scanstatus() is equivalent to calling
10827	** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
10828	**
10829	** Parameter "idx" identifies the specific query element to retrieve statistics
10830	** for. Query elements are numbered starting from zero. A value of -1 may be
10831	** to query for statistics regarding the entire query. ^If idx is out of range
10832	** - less than -1 or greater than or equal to the total number of query
10833	** elements used to implement the statement - a non-zero value is returned and
10834	** the variable that pOut points to is unchanged.
10835	**
10836	** See also: [sqlite3_stmt_scanstatus_reset()]
	@@ -10869,11 +10871,11 @@
10869	/*
10870	** CAPI3REF: Flush caches to disk mid-transaction
10871	** METHOD: sqlite3
10872	**
10873	** ^If a write-transaction is open on [database connection] D when the
10874	** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
10875	** pages in the pager-cache that are not currently in use are written out
10876	** to disk. A dirty page may be in use if a database cursor created by an
10877	** active SQL statement is reading from it, or if it is page 1 of a database
10878	** file (page 1 is always "in use"). ^The [sqlite3_db_cacheflush(D)]
10879	** interface flushes caches for all schemas - "main", "temp", and
	@@ -10983,12 +10985,12 @@
10983	** operation; or 1 for inserts, updates, or deletes invoked by top-level
10984	** triggers; or 2 for changes resulting from triggers called by top-level
10985	** triggers; and so forth.
10986	**
10987	** When the [sqlite3_blob_write()] API is used to update a blob column,
10988	** the pre-update hook is invoked with SQLITE_DELETE. This is because the
10989	** in this case the new values are not available. In this case, when a
10990	** callback made with op==SQLITE_DELETE is actually a write using the
10991	** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
10992	** the index of the column being written. In other cases, where the
10993	** pre-update hook is being invoked for some other reason, including a
10994	** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
	@@ -11237,20 +11239,20 @@
11237	** is written into *P.
11238	**
11239	** For an ordinary on-disk database file, the serialization is just a
11240	** copy of the disk file. For an in-memory database or a "TEMP" database,
11241	** the serialization is the same sequence of bytes which would be written
11242	** to disk if that database where backed up to disk.
11243	**
11244	** The usual case is that sqlite3_serialize() copies the serialization of
11245	** the database into memory obtained from [sqlite3_malloc64()] and returns
11246	** a pointer to that memory. The caller is responsible for freeing the
11247	** returned value to avoid a memory leak. However, if the F argument
11248	** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
11249	** are made, and the sqlite3_serialize() function will return a pointer
11250	** to the contiguous memory representation of the database that SQLite
11251	** is currently using for that database, or NULL if the no such contiguous
11252	** memory representation of the database exists. A contiguous memory
11253	** representation of the database will usually only exist if there has
11254	** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
11255	** values of D and S.
11256	** The size of the database is written into *P even if the
	@@ -11317,11 +11319,11 @@
11317	**
11318	** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
11319	** database is currently in a read transaction or is involved in a backup
11320	** operation.
11321	**
11322	** It is not possible to deserialized into the TEMP database. If the
11323	** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
11324	** function returns SQLITE_ERROR.
11325	**
11326	** The deserialized database should not be in [WAL mode]. If the database
11327	** is in WAL mode, then any attempt to use the database file will result
	@@ -11339,19 +11341,19 @@
11339	*/
11340	SQLITE_API int sqlite3_deserialize(
11341	sqlite3 db, / The database connection */
11342	const char zSchema, / Which DB to reopen with the deserialization */
11343	unsigned char pData, / The serialized database content */
11344	sqlite3_int64 szDb, /* Number bytes in the deserialization */
11345	sqlite3_int64 szBuf, /* Total size of buffer pData[] */
11346	unsigned mFlags /* Zero or more SQLITE_DESERIALIZE_* flags */
11347	);
11348
11349	/*
11350	** CAPI3REF: Flags for sqlite3_deserialize()
11351	**
11352	** The following are allowed values for 6th argument (the F argument) to
11353	** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
11354	**
11355	** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
11356	** in the P argument is held in memory obtained from [sqlite3_malloc64()]
11357	** and that SQLite should take ownership of this memory and automatically
	@@ -11872,13 +11874,14 @@
11872	** This may appear to have some counter-intuitive effects if a single row
11873	** is written to more than once during a session. For example, if a row
11874	** is inserted while a session object is enabled, then later deleted while
11875	** the same session object is disabled, no INSERT record will appear in the
11876	** changeset, even though the delete took place while the session was disabled.
11877	** Or, if one field of a row is updated while a session is disabled, and
11878	** another field of the same row is updated while the session is enabled, the
11879	** resulting changeset will contain an UPDATE change that updates both fields.

11880	*/
11881	SQLITE_API int sqlite3session_changeset(
11882	sqlite3_session pSession, / Session object */
11883	int pnChangeset, / OUT: Size of buffer at ppChangeset /
11884	void *ppChangeset / OUT: Buffer containing changeset */
	@@ -12083,11 +12086,11 @@
12083	** CAPI3REF: Flags for sqlite3changeset_start_v2
12084	**
12085	** The following flags may passed via the 4th parameter to
12086	** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
12087	**
12088	** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
12089	** Invert the changeset while iterating through it. This is equivalent to
12090	** inverting a changeset using sqlite3changeset_invert() before applying it.
12091	** It is an error to specify this flag with a patchset.
12092	*/
12093	#define SQLITE_CHANGESETSTART_INVERT 0x0002
	@@ -12628,17 +12631,26 @@
12628	** Apply a changeset or patchset to a database. These functions attempt to
12629	** update the "main" database attached to handle db with the changes found in
12630	** the changeset passed via the second and third arguments.
12631	**
12632	** The fourth argument (xFilter) passed to these functions is the "filter
12633	** callback". If it is not NULL, then for each table affected by at least one
12634	** change in the changeset, the filter callback is invoked with
12635	** the table name as the second argument, and a copy of the context pointer
12636	** passed as the sixth argument as the first. If the "filter callback"
12637	** returns zero, then no attempt is made to apply any changes to the table.
12638	** Otherwise, if the return value is non-zero or the xFilter argument to
12639	** is NULL, all changes related to the table are attempted.









12640	**
12641	** For each table that is not excluded by the filter callback, this function
12642	** tests that the target database contains a compatible table. A table is
12643	** considered compatible if all of the following are true:
12644	**
	@@ -12655,15 +12667,15 @@
12655	** changes associated with the table are applied. A warning message is issued
12656	** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
12657	** one such warning is issued for each table in the changeset.
12658	**
12659	** For each change for which there is a compatible table, an attempt is made
12660	** to modify the table contents according to the UPDATE, INSERT or DELETE
12661	** change. If a change cannot be applied cleanly, the conflict handler
12662	** function passed as the fifth argument to sqlite3changeset_apply() may be
12663	** invoked. A description of exactly when the conflict handler is invoked for
12664	** each type of change is below.
12665	**
12666	** Unlike the xFilter argument, xConflict may not be passed NULL. The results
12667	** of passing anything other than a valid function pointer as the xConflict
12668	** argument are undefined.
12669	**
	@@ -12801,10 +12813,27 @@
12801	void pChangeset, / Changeset blob */
12802	int(*xFilter)(
12803	void pCtx, / Copy of sixth arg to _apply() */
12804	const char zTab / Table name */
12805	),

















12806	int(*xConflict)(
12807	void pCtx, / Copy of sixth arg to _apply() */
12808	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12809	sqlite3_changeset_iter p / Handle describing change and conflict */
12810	),
	@@ -13220,10 +13249,27 @@
13220	void pIn, / First arg for xInput */
13221	int(*xFilter)(
13222	void pCtx, / Copy of sixth arg to _apply() */
13223	const char zTab / Table name */
13224	),

















13225	int(*xConflict)(
13226	void pCtx, / Copy of sixth arg to _apply() */
13227	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
13228	sqlite3_changeset_iter p / Handle describing change and conflict */
13229	),
	@@ -15173,11 +15219,11 @@
15173	/*
15174	** GCC does not define the offsetof() macro so we'll have to do it
15175	** ourselves.
15176	*/
15177	#ifndef offsetof
15178	#define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
15179	#endif
15180
15181	/*
15182	** Work around C99 "flex-array" syntax for pre-C99 compilers, so as
15183	** to avoid complaints from -fsanitize=strict-bounds.
	@@ -15439,12 +15485,12 @@
15439	/*
15440	** Macro SMXV(n) return the maximum value that can be held in variable n,
15441	** assuming n is a signed integer type. UMXV(n) is similar for unsigned
15442	** integer types.
15443	*/
15444	#define SMXV(n) ((((i64)1)<<(sizeof(n)-1))-1)
15445	#define UMXV(n) ((((i64)1)<<(sizeof(n)))-1)
15446
15447	/*
15448	** Round up a number to the next larger multiple of 8. This is used
15449	** to force 8-byte alignment on 64-bit architectures.
15450	**
	@@ -15561,10 +15607,12 @@
15561	** 0x00008000 After all FROM-clause analysis
15562	** 0x00010000 Beginning of DELETE/INSERT/UPDATE processing
15563	** 0x00020000 Transform DISTINCT into GROUP BY
15564	** 0x00040000 SELECT tree dump after all code has been generated
15565	** 0x00080000 NOT NULL strength reduction


15566	*/
15567
15568	/*
15569	** Macros for "wheretrace"
15570	*/
	@@ -15605,10 +15653,11 @@
15605	**
15606	** 0x00010000 Show more detail when printing WHERE terms
15607	** 0x00020000 Show WHERE terms returned from whereScanNext()
15608	** 0x00040000 Solver overview messages
15609	** 0x00080000 Star-query heuristic

15610	*/
15611
15612
15613	/*
15614	** An instance of the following structure is used to store the busy-handler
	@@ -15677,11 +15726,11 @@
15677	** one parameter that destructors normally want. So we have to introduce
15678	** this magic value that the code knows to handle differently. Any
15679	** pointer will work here as long as it is distinct from SQLITE_STATIC
15680	** and SQLITE_TRANSIENT.
15681	*/
15682	#define SQLITE_DYNAMIC ((sqlite3_destructor_type)sqlite3OomClear)
15683
15684	/*
15685	** When SQLITE_OMIT_WSD is defined, it means that the target platform does
15686	** not support Writable Static Data (WSD) such as global and static variables.
15687	** All variables must either be on the stack or dynamically allocated from
	@@ -16745,10 +16794,11 @@
16745	};
16746
16747	SQLITE_PRIVATE int sqlite3BtreeInsert(BtCursor, const BtreePayload pPayload,
16748	int flags, int seekResult);
16749	SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor, int pRes);

16750	SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor, int pRes);
16751	SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor*, int flags);
16752	SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor*);
16753	SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int flags);
16754	SQLITE_PRIVATE i64 sqlite3BtreeIntegerKey(BtCursor*);
	@@ -17078,76 +17128,76 @@
17078	#define OP_Last 32 /* jump0 */
17079	#define OP_IfSizeBetween 33 /* jump */
17080	#define OP_SorterSort 34 /* jump */
17081	#define OP_Sort 35 /* jump */
17082	#define OP_Rewind 36 /* jump0 */
17083	#define OP_SorterNext 37 /* jump */
17084	#define OP_Prev 38 /* jump */
17085	#define OP_Next 39 /* jump */
17086	#define OP_IdxLE 40 /* jump, synopsis: key=r[P3@P4] */
17087	#define OP_IdxGT 41 /* jump, synopsis: key=r[P3@P4] */
17088	#define OP_IdxLT 42 /* jump, synopsis: key=r[P3@P4] */
17089	#define OP_Or 43 /* same as TK_OR, synopsis: r[P3]=(r[P1] \|\| r[P2]) */
17090	#define OP_And 44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
17091	#define OP_IdxGE 45 /* jump, synopsis: key=r[P3@P4] */
17092	#define OP_RowSetRead 46 /* jump, synopsis: r[P3]=rowset(P1) */
17093	#define OP_RowSetTest 47 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
17094	#define OP_Program 48 /* jump0 */
17095	#define OP_FkIfZero 49 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
17096	#define OP_IfPos 50 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
17097	#define OP_IsNull 51 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
17098	#define OP_NotNull 52 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
17099	#define OP_Ne 53 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
17100	#define OP_Eq 54 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
17101	#define OP_Gt 55 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
17102	#define OP_Le 56 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
17103	#define OP_Lt 57 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
17104	#define OP_Ge 58 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
17105	#define OP_ElseEq 59 /* jump, same as TK_ESCAPE */
17106	#define OP_IfNotZero 60 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
17107	#define OP_DecrJumpZero 61 /* jump, synopsis: if (--r[P1])==0 goto P2 */
17108	#define OP_IncrVacuum 62 /* jump */
17109	#define OP_VNext 63 /* jump */
17110	#define OP_Filter 64 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
17111	#define OP_PureFunc 65 /* synopsis: r[P3]=func(r[P2@NP]) */
17112	#define OP_Function 66 /* synopsis: r[P3]=func(r[P2@NP]) */
17113	#define OP_Return 67
17114	#define OP_EndCoroutine 68
17115	#define OP_HaltIfNull 69 /* synopsis: if r[P3]=null halt */
17116	#define OP_Halt 70
17117	#define OP_Integer 71 /* synopsis: r[P2]=P1 */
17118	#define OP_Int64 72 /* synopsis: r[P2]=P4 */
17119	#define OP_String 73 /* synopsis: r[P2]='P4' (len=P1) */
17120	#define OP_BeginSubrtn 74 /* synopsis: r[P2]=NULL */
17121	#define OP_Null 75 /* synopsis: r[P2..P3]=NULL */
17122	#define OP_SoftNull 76 /* synopsis: r[P1]=NULL */
17123	#define OP_Blob 77 /* synopsis: r[P2]=P4 (len=P1) */
17124	#define OP_Variable 78 /* synopsis: r[P2]=parameter(P1) */
17125	#define OP_Move 79 /* synopsis: r[P2@P3]=r[P1@P3] */
17126	#define OP_Copy 80 /* synopsis: r[P2@P3+1]=r[P1@P3+1] */
17127	#define OP_SCopy 81 /* synopsis: r[P2]=r[P1] */
17128	#define OP_IntCopy 82 /* synopsis: r[P2]=r[P1] */
17129	#define OP_FkCheck 83
17130	#define OP_ResultRow 84 /* synopsis: output=r[P1@P2] */
17131	#define OP_CollSeq 85
17132	#define OP_AddImm 86 /* synopsis: r[P1]=r[P1]+P2 */
17133	#define OP_RealAffinity 87
17134	#define OP_Cast 88 /* synopsis: affinity(r[P1]) */
17135	#define OP_Permutation 89
17136	#define OP_Compare 90 /* synopsis: r[P1@P3] <-> r[P2@P3] */
17137	#define OP_IsTrue 91 /* synopsis: r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4 */
17138	#define OP_ZeroOrNull 92 /* synopsis: r[P2] = 0 OR NULL */
17139	#define OP_Offset 93 /* synopsis: r[P3] = sqlite_offset(P1) */
17140	#define OP_Column 94 /* synopsis: r[P3]=PX cursor P1 column P2 */
17141	#define OP_TypeCheck 95 /* synopsis: typecheck(r[P1@P2]) */
17142	#define OP_Affinity 96 /* synopsis: affinity(r[P1@P2]) */
17143	#define OP_MakeRecord 97 /* synopsis: r[P3]=mkrec(r[P1@P2]) */
17144	#define OP_Count 98 /* synopsis: r[P2]=count() */
17145	#define OP_ReadCookie 99
17146	#define OP_SetCookie 100
17147	#define OP_ReopenIdx 101 /* synopsis: root=P2 iDb=P3 */
17148	#define OP_OpenRead 102 /* synopsis: root=P2 iDb=P3 */
17149	#define OP_BitAnd 103 /* same as TK_BITAND, synopsis: r[P3]=r[P1]&r[P2] */
17150	#define OP_BitOr 104 /* same as TK_BITOR, synopsis: r[P3]=r[P1]\|r[P2] */
17151	#define OP_ShiftLeft 105 /* same as TK_LSHIFT, synopsis: r[P3]=r[P2]<<r[P1] */
17152	#define OP_ShiftRight 106 /* same as TK_RSHIFT, synopsis: r[P3]=r[P2]>>r[P1] */
17153	#define OP_Add 107 /* same as TK_PLUS, synopsis: r[P3]=r[P1]+r[P2] */
	@@ -17154,87 +17204,88 @@
17154	#define OP_Subtract 108 /* same as TK_MINUS, synopsis: r[P3]=r[P2]-r[P1] */
17155	#define OP_Multiply 109 /* same as TK_STAR, synopsis: r[P3]=r[P1]r[P2] /
17156	#define OP_Divide 110 /* same as TK_SLASH, synopsis: r[P3]=r[P2]/r[P1] */
17157	#define OP_Remainder 111 /* same as TK_REM, synopsis: r[P3]=r[P2]%r[P1] */
17158	#define OP_Concat 112 /* same as TK_CONCAT, synopsis: r[P3]=r[P2]+r[P1] */
17159	#define OP_OpenWrite 113 /* synopsis: root=P2 iDb=P3 */
17160	#define OP_OpenDup 114
17161	#define OP_BitNot 115 /* same as TK_BITNOT, synopsis: r[P2]= ~r[P1] */
17162	#define OP_OpenAutoindex 116 /* synopsis: nColumn=P2 */
17163	#define OP_OpenEphemeral 117 /* synopsis: nColumn=P2 */
17164	#define OP_String8 118 /* same as TK_STRING, synopsis: r[P2]='P4' */
17165	#define OP_SorterOpen 119
17166	#define OP_SequenceTest 120 /* synopsis: if( cursor[P1].ctr++ ) pc = P2 */
17167	#define OP_OpenPseudo 121 /* synopsis: P3 columns in r[P2] */
17168	#define OP_Close 122
17169	#define OP_ColumnsUsed 123
17170	#define OP_SeekScan 124 /* synopsis: Scan-ahead up to P1 rows */
17171	#define OP_SeekHit 125 /* synopsis: set P2<=seekHit<=P3 */
17172	#define OP_Sequence 126 /* synopsis: r[P2]=cursor[P1].ctr++ */
17173	#define OP_NewRowid 127 /* synopsis: r[P2]=rowid */
17174	#define OP_Insert 128 /* synopsis: intkey=r[P3] data=r[P2] */
17175	#define OP_RowCell 129
17176	#define OP_Delete 130
17177	#define OP_ResetCount 131
17178	#define OP_SorterCompare 132 /* synopsis: if key(P1)!=trim(r[P3],P4) goto P2 */
17179	#define OP_SorterData 133 /* synopsis: r[P2]=data */
17180	#define OP_RowData 134 /* synopsis: r[P2]=data */
17181	#define OP_Rowid 135 /* synopsis: r[P2]=PX rowid of P1 */
17182	#define OP_NullRow 136
17183	#define OP_SeekEnd 137
17184	#define OP_IdxInsert 138 /* synopsis: key=r[P2] */
17185	#define OP_SorterInsert 139 /* synopsis: key=r[P2] */
17186	#define OP_IdxDelete 140 /* synopsis: key=r[P2@P3] */
17187	#define OP_DeferredSeek 141 /* synopsis: Move P3 to P1.rowid if needed */
17188	#define OP_IdxRowid 142 /* synopsis: r[P2]=rowid */
17189	#define OP_FinishSeek 143
17190	#define OP_Destroy 144
17191	#define OP_Clear 145
17192	#define OP_ResetSorter 146
17193	#define OP_CreateBtree 147 /* synopsis: r[P2]=root iDb=P1 flags=P3 */
17194	#define OP_SqlExec 148
17195	#define OP_ParseSchema 149
17196	#define OP_LoadAnalysis 150
17197	#define OP_DropTable 151
17198	#define OP_DropIndex 152
17199	#define OP_DropTrigger 153
17200	#define OP_Real 154 /* same as TK_FLOAT, synopsis: r[P2]=P4 */
17201	#define OP_IntegrityCk 155
17202	#define OP_RowSetAdd 156 /* synopsis: rowset(P1)=r[P2] */
17203	#define OP_Param 157
17204	#define OP_FkCounter 158 /* synopsis: fkctr[P1]+=P2 */
17205	#define OP_MemMax 159 /* synopsis: r[P1]=max(r[P1],r[P2]) */
17206	#define OP_OffsetLimit 160 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */
17207	#define OP_AggInverse 161 /* synopsis: accum=r[P3] inverse(r[P2@P5]) */
17208	#define OP_AggStep 162 /* synopsis: accum=r[P3] step(r[P2@P5]) */
17209	#define OP_AggStep1 163 /* synopsis: accum=r[P3] step(r[P2@P5]) */
17210	#define OP_AggValue 164 /* synopsis: r[P3]=value N=P2 */
17211	#define OP_AggFinal 165 /* synopsis: accum=r[P1] N=P2 */
17212	#define OP_Expire 166
17213	#define OP_CursorLock 167
17214	#define OP_CursorUnlock 168
17215	#define OP_TableLock 169 /* synopsis: iDb=P1 root=P2 write=P3 */
17216	#define OP_VBegin 170
17217	#define OP_VCreate 171
17218	#define OP_VDestroy 172
17219	#define OP_VOpen 173
17220	#define OP_VCheck 174
17221	#define OP_VInitIn 175 /* synopsis: r[P2]=ValueList(P1,P3) */
17222	#define OP_VColumn 176 /* synopsis: r[P3]=vcolumn(P2) */
17223	#define OP_VRename 177
17224	#define OP_Pagecount 178
17225	#define OP_MaxPgcnt 179
17226	#define OP_ClrSubtype 180 /* synopsis: r[P1].subtype = 0 */
17227	#define OP_GetSubtype 181 /* synopsis: r[P2] = r[P1].subtype */
17228	#define OP_SetSubtype 182 /* synopsis: r[P2].subtype = r[P1] */
17229	#define OP_FilterAdd 183 /* synopsis: filter(P1) += key(P3@P4) */
17230	#define OP_Trace 184
17231	#define OP_CursorHint 185
17232	#define OP_ReleaseReg 186 /* synopsis: release r[P1@P2] mask P3 */
17233	#define OP_Noop 187
17234	#define OP_Explain 188
17235	#define OP_Abortable 189

17236
17237	/* Properties such as "out2" or "jump" that are specified in
17238	** comments following the "case" for each opcode in the vdbe.c
17239	** are encoded into bitvectors as follows:
17240	*/
	@@ -17249,38 +17300,38 @@
17249	#define OPFLG_INITIALIZER {\
17250	/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x41, 0x00,\
17251	/* 8 */ 0x81, 0x01, 0x01, 0x81, 0x83, 0x83, 0x01, 0x01,\
17252	/* 16 */ 0x03, 0x03, 0x01, 0x12, 0x01, 0xc9, 0xc9, 0xc9,\
17253	/* 24 */ 0xc9, 0x01, 0x49, 0x49, 0x49, 0x49, 0xc9, 0x49,\
17254	/* 32 */ 0xc1, 0x01, 0x41, 0x41, 0xc1, 0x01, 0x41, 0x41,\
17255	/* 40 */ 0x41, 0x41, 0x41, 0x26, 0x26, 0x41, 0x23, 0x0b,\
17256	/* 48 */ 0x81, 0x01, 0x03, 0x03, 0x03, 0x0b, 0x0b, 0x0b,\
17257	/* 56 */ 0x0b, 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x01, 0x41,\
17258	/* 64 */ 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00, 0x10,\
17259	/* 72 */ 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,\
17260	/* 80 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02, 0x02,\
17261	/* 88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x40, 0x00,\
17262	/* 96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x40, 0x40, 0x26,\
17263	/* 104 */ 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26,\
17264	/* 112 */ 0x26, 0x00, 0x40, 0x12, 0x40, 0x40, 0x10, 0x00,\
17265	/* 120 */ 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x10, 0x10,\
17266	/* 128 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x50,\
17267	/* 136 */ 0x00, 0x40, 0x04, 0x04, 0x00, 0x40, 0x50, 0x40,\
17268	/* 144 */ 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,\
17269	/* 152 */ 0x00, 0x00, 0x10, 0x00, 0x06, 0x10, 0x00, 0x04,\
17270	/* 160 */ 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
17271	/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x50,\
17272	/* 176 */ 0x40, 0x00, 0x10, 0x10, 0x02, 0x12, 0x12, 0x00,\
17273	/* 184 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,}
17274
17275	/* The resolve3P2Values() routine is able to run faster if it knows
17276	** the value of the largest JUMP opcode. The smaller the maximum
17277	** JUMP opcode the better, so the mkopcodeh.tcl script that
17278	** generated this include file strives to group all JUMP opcodes
17279	** together near the beginning of the list.
17280	*/
17281	#define SQLITE_MX_JUMP_OPCODE 64 /* Maximum JUMP opcode */
17282
17283	/************ End of opcodes.h *******************************************/
17284	/************ Continuing where we left off in vdbe.h *********************/
17285
17286	/*
	@@ -17400,11 +17451,11 @@
17400	SQLITE_PRIVATE char sqlite3VdbeExpandSql(Vdbe, const char*);
17401	#endif
17402	SQLITE_PRIVATE int sqlite3MemCompare(const Mem, const Mem, const CollSeq*);
17403	SQLITE_PRIVATE int sqlite3BlobCompare(const Mem, const Mem);
17404
17405	SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(KeyInfo,int,const void,UnpackedRecord*);
17406	SQLITE_PRIVATE int sqlite3VdbeRecordCompare(int,const void,UnpackedRecord);
17407	SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(int, const void , UnpackedRecord , int);
17408	SQLITE_PRIVATE UnpackedRecord sqlite3VdbeAllocUnpackedRecord(KeyInfo);
17409
17410	typedef int (RecordCompare)(int,const void,UnpackedRecord*);
	@@ -17413,11 +17464,13 @@
17413	SQLITE_PRIVATE void sqlite3VdbeLinkSubProgram(Vdbe , SubProgram );
17414	SQLITE_PRIVATE int sqlite3VdbeHasSubProgram(Vdbe*);
17415
17416	SQLITE_PRIVATE void sqlite3MemSetArrayInt64(sqlite3_value *aMem, int iIdx, i64 val);
17417

17418	SQLITE_PRIVATE int sqlite3NotPureFunc(sqlite3_context*);

17419	#ifdef SQLITE_ENABLE_BYTECODE_VTAB
17420	SQLITE_PRIVATE int sqlite3VdbeBytecodeVtabInit(sqlite3*);
17421	#endif
17422
17423	/* Use SQLITE_ENABLE_EXPLAIN_COMMENTS to enable generation of extra
	@@ -18295,10 +18348,11 @@
18295	#define SQLITE_Coroutines 0x02000000 /* Co-routines for subqueries */
18296	#define SQLITE_NullUnusedCols 0x04000000 /* NULL unused columns in subqueries */
18297	#define SQLITE_OnePass 0x08000000 /* Single-pass DELETE and UPDATE */
18298	#define SQLITE_OrderBySubq 0x10000000 /* ORDER BY in subquery helps outer */
18299	#define SQLITE_StarQuery 0x20000000 /* Heurists for star queries */

18300	#define SQLITE_AllOpts 0xffffffff /* All optimizations */
18301
18302	/*
18303	** Macros for testing whether or not optimizations are enabled or disabled.
18304	*/
	@@ -18533,11 +18587,11 @@
18533	SQLITE_FUNC_CONSTANT\|SQLITE_UTF8\|(bNC*SQLITE_FUNC_NEEDCOLL)\|extraFlags,\
18534	SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, 0, #zName, {0} }
18535	#define STR_FUNCTION(zName, nArg, pArg, bNC, xFunc) \
18536	{nArg, SQLITE_FUNC_BUILTIN\|\
18537	SQLITE_FUNC_SLOCHNG\|SQLITE_UTF8\|(bNC*SQLITE_FUNC_NEEDCOLL), \
18538	pArg, 0, xFunc, 0, 0, 0, #zName, }
18539	#define LIKEFUNC(zName, nArg, arg, flags) \
18540	{nArg, SQLITE_FUNC_BUILTIN\|SQLITE_FUNC_CONSTANT\|SQLITE_UTF8\|flags, \
18541	(void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} }
18542	#define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \
18543	{nArg, SQLITE_FUNC_BUILTIN\|SQLITE_UTF8\|(nc*SQLITE_FUNC_NEEDCOLL)\|f, \
	@@ -18700,10 +18754,11 @@
18700	#define SQLITE_AFF_TEXT 0x42 /* 'B' */
18701	#define SQLITE_AFF_NUMERIC 0x43 /* 'C' */
18702	#define SQLITE_AFF_INTEGER 0x44 /* 'D' */
18703	#define SQLITE_AFF_REAL 0x45 /* 'E' */
18704	#define SQLITE_AFF_FLEXNUM 0x46 /* 'F' */

18705
18706	#define sqlite3IsNumericAffinity(X) ((X)>=SQLITE_AFF_NUMERIC)
18707
18708	/*
18709	** The SQLITE_AFF_MASK values masks off the significant bits of an
	@@ -19015,13 +19070,19 @@
19015	/*
19016	** An instance of the following structure is passed as the first
19017	** argument to sqlite3VdbeKeyCompare and is used to control the
19018	** comparison of the two index keys.
19019	**
19020	** Note that aSortOrder[] and aColl[] have nField+1 slots. There
19021	** are nField slots for the columns of an index then one extra slot
19022	** for the rowid at the end.






19023	*/
19024	struct KeyInfo {
19025	u32 nRef; /* Number of references to this KeyInfo object */
19026	u8 enc; /* Text encoding - one of the SQLITE_UTF* values */
19027	u16 nKeyField; /* Number of key columns in the index */
	@@ -19029,12 +19090,21 @@
19029	sqlite3 db; / The database connection */
19030	u8 aSortFlags; / Sort order for each column. */
19031	CollSeq aColl[FLEXARRAY]; / Collating sequence for each term of the key */
19032	};
19033
19034	/* The size (in bytes) of a KeyInfo object with up to N fields */


19035	#define SZ_KEYINFO(N) (offsetof(KeyInfo,aColl) + (N)sizeof(CollSeq))







19036
19037	/*
19038	** Allowed bit values for entries in the KeyInfo.aSortFlags[] array.
19039	*/
19040	#define KEYINFO_ORDER_DESC 0x01 /* DESC sort order */
	@@ -19050,23 +19120,22 @@
19050	** the OP_MakeRecord opcode of the VDBE and is disassembled by the
19051	** OP_Column opcode.
19052	**
19053	** An instance of this object serves as a "key" for doing a search on
19054	** an index b+tree. The goal of the search is to find the entry that
19055	** is closed to the key described by this object. This object might hold
19056	** just a prefix of the key. The number of fields is given by
19057	** pKeyInfo->nField.
19058	**
19059	** The r1 and r2 fields are the values to return if this key is less than
19060	** or greater than a key in the btree, respectively. These are normally
19061	** -1 and +1 respectively, but might be inverted to +1 and -1 if the b-tree
19062	** is in DESC order.
19063	**
19064	** The key comparison functions actually return default_rc when they find
19065	** an equals comparison. default_rc can be -1, 0, or +1. If there are
19066	** multiple entries in the b-tree with the same key (when only looking
19067	** at the first pKeyInfo->nFields,) then default_rc can be set to -1 to
19068	** cause the search to find the last match, or +1 to cause the search to
19069	** find the first match.
19070	**
19071	** The key comparison functions will set eqSeen to true if they ever
19072	** get and equal results when comparing this structure to a b-tree record.
	@@ -19074,12 +19143,12 @@
19074	** before the first match or immediately after the last match. The
19075	** eqSeen field will indicate whether or not an exact match exists in the
19076	** b-tree.
19077	*/
19078	struct UnpackedRecord {
19079	KeyInfo pKeyInfo; / Collation and sort-order information */
19080	Mem aMem; / Values */
19081	union {
19082	char z; / Cache of aMem[0].z for vdbeRecordCompareString() */
19083	i64 i; /* Cache of aMem[0].u.i for vdbeRecordCompareInt() */
19084	} u;
19085	int n; /* Cache of aMem[0].n used by vdbeRecordCompareString() */
	@@ -19160,14 +19229,12 @@
19160	unsigned uniqNotNull:1; /* True if UNIQUE and NOT NULL for all columns */
19161	unsigned isResized:1; /* True if resizeIndexObject() has been called */
19162	unsigned isCovering:1; /* True if this is a covering index */
19163	unsigned noSkipScan:1; /* Do not try to use skip-scan if true */
19164	unsigned hasStat1:1; /* aiRowLogEst values come from sqlite_stat1 */
19165	unsigned bLowQual:1; /* sqlite_stat1 says this is a low-quality index */
19166	unsigned bNoQuery:1; /* Do not use this index to optimize queries */
19167	unsigned bAscKeyBug:1; /* True if the bba7b69f9849b5bf bug applies */
19168	unsigned bIdxRowid:1; /* One or more of the index keys is the ROWID */
19169	unsigned bHasVCol:1; /* Index references one or more VIRTUAL columns */
19170	unsigned bHasExpr:1; /* Index contains an expression, either a literal
19171	** expression, or a reference to a VIRTUAL column */
19172	#ifdef SQLITE_ENABLE_STAT4
19173	int nSample; /* Number of elements in aSample[] */
	@@ -19251,21 +19318,21 @@
19251	struct AggInfo {
19252	u8 directMode; /* Direct rendering mode means take data directly
19253	** from source tables rather than from accumulators */
19254	u8 useSortingIdx; /* In direct mode, reference the sorting index rather
19255	** than the source table */
19256	u16 nSortingColumn; /* Number of columns in the sorting index */
19257	int sortingIdx; /* Cursor number of the sorting index */
19258	int sortingIdxPTab; /* Cursor number of pseudo-table */
19259	int iFirstReg; /* First register in range for aCol[] and aFunc[] */
19260	ExprList pGroupBy; / The group by clause */
19261	struct AggInfo_col { /* For each column used in source tables */
19262	Table pTab; / Source table */
19263	Expr pCExpr; / The original expression */
19264	int iTable; /* Cursor number of the source table */
19265	i16 iColumn; /* Column number within the source table */
19266	i16 iSorterColumn; /* Column number in the sorting index */
19267	} *aCol;
19268	int nColumn; /* Number of used entries in aCol[] */
19269	int nAccumulator; /* Number of columns that show through to the output.
19270	** Additional columns are used only as parameters to
19271	** aggregate functions */
	@@ -19725,10 +19792,11 @@
19725	unsigned isSynthUsing :1; /* u3.pUsing is synthesized from NATURAL */
19726	unsigned isNestedFrom :1; /* pSelect is a SF_NestedFrom subquery */
19727	unsigned rowidUsed :1; /* The ROWID of this table is referenced */
19728	unsigned fixedSchema :1; /* Uses u4.pSchema, not u4.zDatabase */
19729	unsigned hadSchema :1; /* Had u4.zDatabase before u4.pSchema */

19730	} fg;
19731	int iCursor; /* The VDBE cursor number used to access this table */
19732	Bitmask colUsed; /* Bit N set if column N used. Details above for N>62 */
19733	union {
19734	char zIndexedBy; / Identifier from "INDEXED BY <zIndex>" clause */
	@@ -20255,10 +20323,11 @@
20255	u8 mayAbort; /* True if statement may throw an ABORT exception */
20256	u8 hasCompound; /* Need to invoke convertCompoundSelectToSubquery() */
20257	u8 disableLookaside; /* Number of times lookaside has been disabled */
20258	u8 prepFlags; /* SQLITE_PREPARE_* flags */
20259	u8 withinRJSubrtn; /* Nesting level for RIGHT JOIN body subroutines */

20260	u8 mSubrtnSig; /* mini Bloom filter on available SubrtnSig.selId */
20261	u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */
20262	u8 bReturning; /* Coding a RETURNING trigger */
20263	u8 eOrconf; /* Default ON CONFLICT policy for trigger steps */
20264	u8 disableTriggers; /* True to disable triggers */
	@@ -21251,10 +21320,11 @@
21251	#endif
21252	#ifndef SQLITE_OMIT_WINDOWFUNC
21253	SQLITE_PRIVATE void sqlite3ShowWindow(const Window*);
21254	SQLITE_PRIVATE void sqlite3ShowWinFunc(const Window*);
21255	#endif

21256	#endif
21257
21258	SQLITE_PRIVATE void sqlite3SetString(char *, sqlite3, const char*);
21259	SQLITE_PRIVATE void sqlite3ProgressCheck(Parse*);
21260	SQLITE_PRIVATE void sqlite3ErrorMsg(Parse, const char, ...);
	@@ -22424,10 +22494,13 @@
22424	#ifdef SQLITE_BITMASK_TYPE
22425	"BITMASK_TYPE=" CTIMEOPT_VAL(SQLITE_BITMASK_TYPE),
22426	#endif
22427	#ifdef SQLITE_BUG_COMPATIBLE_20160819
22428	"BUG_COMPATIBLE_20160819",



22429	#endif
22430	#ifdef SQLITE_CASE_SENSITIVE_LIKE
22431	"CASE_SENSITIVE_LIKE",
22432	#endif
22433	#ifdef SQLITE_CHECK_PAGES
	@@ -23860,11 +23933,11 @@
23860	** * MEM_Blob A blob, stored in Mem.z length Mem.n.
23861	** Incompatible with MEM_Str, MEM_Null,
23862	** MEM_Int, MEM_Real, and MEM_IntReal.
23863	**
23864	** * MEM_Blob\|MEM_Zero A blob in Mem.z of length Mem.n plus
23865	** MEM.u.i extra 0x00 bytes at the end.
23866	**
23867	** * MEM_Int Integer stored in Mem.u.i.
23868	**
23869	** * MEM_Real Real stored in Mem.u.r.
23870	**
	@@ -24129,11 +24202,11 @@
24129	Mem oldipk; /* Memory cell holding "old" IPK value */
24130	Mem aNew; / Array of new.* values */
24131	Table pTab; / Schema object being updated */
24132	Index pPk; / PK index if pTab is WITHOUT ROWID */
24133	sqlite3_value *apDflt; / Array of default values, if required */
24134	u8 keyinfoSpace[SZ_KEYINFO(0)]; /* Space to hold pKeyinfo[0] content */
24135	};
24136
24137	/*
24138	** An instance of this object is used to pass an vector of values into
24139	** OP_VFilter, the xFilter method of a virtual table. The vector is the
	@@ -32059,10 +32132,18 @@
32059	}else{
32060	longvalue = va_arg(ap,unsigned int);
32061	}
32062	prefix = 0;
32063	}








32064	if( longvalue==0 ) flag_alternateform = 0;
32065	if( flag_zeropad && precision<width-(prefix!=0) ){
32066	precision = width-(prefix!=0);
32067	}
32068	if( precision<etBUFSIZE-10-etBUFSIZE/3 ){
	@@ -32987,10 +33068,19 @@
32987	va_end(ap);
32988	zBuf[acc.nChar] = 0;
32989	return zBuf;
32990	}
32991









32992	/*
32993	** This is the routine that actually formats the sqlite3_log() message.
32994	** We house it in a separate routine from sqlite3_log() to avoid using
32995	** stack space on small-stack systems when logging is disabled.
32996	**
	@@ -33003,11 +33093,11 @@
33003	** Care must be taken that any sqlite3_log() calls that occur while the
33004	** memory mutex is held do not use these mechanisms.
33005	*/
33006	static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){
33007	StrAccum acc; /* String accumulator */
33008	char zMsg[SQLITE_PRINT_BUF_SIZE3]; / Complete log message */
33009
33010	sqlite3StrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0);
33011	sqlite3_str_vappendf(&acc, zFormat, ap);
33012	sqlite3GlobalConfig.xLog(sqlite3GlobalConfig.pLogArg, iErrCode,
33013	sqlite3StrAccumFinish(&acc));
	@@ -35001,11 +35091,11 @@
35001	}
35002
35003	/*
35004	** Write a single UTF8 character whose value is v into the
35005	** buffer starting at zOut. zOut must be sized to hold at
35006	** least for bytes. Return the number of bytes needed
35007	** to encode the new character.
35008	*/
35009	SQLITE_PRIVATE int sqlite3AppendOneUtf8Character(char *zOut, u32 v){
35010	if( v<0x00080 ){
35011	zOut[0] = (u8)(v & 0xff);
	@@ -37681,76 +37771,76 @@
37681	/* 32 */ "Last" OpHelp(""),
37682	/* 33 */ "IfSizeBetween" OpHelp(""),
37683	/* 34 */ "SorterSort" OpHelp(""),
37684	/* 35 */ "Sort" OpHelp(""),
37685	/* 36 */ "Rewind" OpHelp(""),
37686	/* 37 */ "SorterNext" OpHelp(""),
37687	/* 38 */ "Prev" OpHelp(""),
37688	/* 39 */ "Next" OpHelp(""),
37689	/* 40 */ "IdxLE" OpHelp("key=r[P3@P4]"),
37690	/* 41 */ "IdxGT" OpHelp("key=r[P3@P4]"),
37691	/* 42 */ "IdxLT" OpHelp("key=r[P3@P4]"),
37692	/* 43 */ "Or" OpHelp("r[P3]=(r[P1] \|\| r[P2])"),
37693	/* 44 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"),
37694	/* 45 */ "IdxGE" OpHelp("key=r[P3@P4]"),
37695	/* 46 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
37696	/* 47 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
37697	/* 48 */ "Program" OpHelp(""),
37698	/* 49 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
37699	/* 50 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
37700	/* 51 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"),
37701	/* 52 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"),
37702	/* 53 */ "Ne" OpHelp("IF r[P3]!=r[P1]"),
37703	/* 54 */ "Eq" OpHelp("IF r[P3]==r[P1]"),
37704	/* 55 */ "Gt" OpHelp("IF r[P3]>r[P1]"),
37705	/* 56 */ "Le" OpHelp("IF r[P3]<=r[P1]"),
37706	/* 57 */ "Lt" OpHelp("IF r[P3]<r[P1]"),
37707	/* 58 */ "Ge" OpHelp("IF r[P3]>=r[P1]"),
37708	/* 59 */ "ElseEq" OpHelp(""),
37709	/* 60 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
37710	/* 61 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
37711	/* 62 */ "IncrVacuum" OpHelp(""),
37712	/* 63 */ "VNext" OpHelp(""),
37713	/* 64 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
37714	/* 65 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
37715	/* 66 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
37716	/* 67 */ "Return" OpHelp(""),
37717	/* 68 */ "EndCoroutine" OpHelp(""),
37718	/* 69 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
37719	/* 70 */ "Halt" OpHelp(""),
37720	/* 71 */ "Integer" OpHelp("r[P2]=P1"),
37721	/* 72 */ "Int64" OpHelp("r[P2]=P4"),
37722	/* 73 */ "String" OpHelp("r[P2]='P4' (len=P1)"),
37723	/* 74 */ "BeginSubrtn" OpHelp("r[P2]=NULL"),
37724	/* 75 */ "Null" OpHelp("r[P2..P3]=NULL"),
37725	/* 76 */ "SoftNull" OpHelp("r[P1]=NULL"),
37726	/* 77 */ "Blob" OpHelp("r[P2]=P4 (len=P1)"),
37727	/* 78 */ "Variable" OpHelp("r[P2]=parameter(P1)"),
37728	/* 79 */ "Move" OpHelp("r[P2@P3]=r[P1@P3]"),
37729	/* 80 */ "Copy" OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
37730	/* 81 */ "SCopy" OpHelp("r[P2]=r[P1]"),
37731	/* 82 */ "IntCopy" OpHelp("r[P2]=r[P1]"),
37732	/* 83 */ "FkCheck" OpHelp(""),
37733	/* 84 */ "ResultRow" OpHelp("output=r[P1@P2]"),
37734	/* 85 */ "CollSeq" OpHelp(""),
37735	/* 86 */ "AddImm" OpHelp("r[P1]=r[P1]+P2"),
37736	/* 87 */ "RealAffinity" OpHelp(""),
37737	/* 88 */ "Cast" OpHelp("affinity(r[P1])"),
37738	/* 89 */ "Permutation" OpHelp(""),
37739	/* 90 */ "Compare" OpHelp("r[P1@P3] <-> r[P2@P3]"),
37740	/* 91 */ "IsTrue" OpHelp("r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4"),
37741	/* 92 */ "ZeroOrNull" OpHelp("r[P2] = 0 OR NULL"),
37742	/* 93 */ "Offset" OpHelp("r[P3] = sqlite_offset(P1)"),
37743	/* 94 */ "Column" OpHelp("r[P3]=PX cursor P1 column P2"),
37744	/* 95 */ "TypeCheck" OpHelp("typecheck(r[P1@P2])"),
37745	/* 96 */ "Affinity" OpHelp("affinity(r[P1@P2])"),
37746	/* 97 */ "MakeRecord" OpHelp("r[P3]=mkrec(r[P1@P2])"),
37747	/* 98 */ "Count" OpHelp("r[P2]=count()"),
37748	/* 99 */ "ReadCookie" OpHelp(""),
37749	/* 100 */ "SetCookie" OpHelp(""),
37750	/* 101 */ "ReopenIdx" OpHelp("root=P2 iDb=P3"),
37751	/* 102 */ "OpenRead" OpHelp("root=P2 iDb=P3"),
37752	/* 103 */ "BitAnd" OpHelp("r[P3]=r[P1]&r[P2]"),
37753	/* 104 */ "BitOr" OpHelp("r[P3]=r[P1]\|r[P2]"),
37754	/* 105 */ "ShiftLeft" OpHelp("r[P3]=r[P2]<<r[P1]"),
37755	/* 106 */ "ShiftRight" OpHelp("r[P3]=r[P2]>>r[P1]"),
37756	/* 107 */ "Add" OpHelp("r[P3]=r[P1]+r[P2]"),
	@@ -37757,87 +37847,88 @@
37757	/* 108 */ "Subtract" OpHelp("r[P3]=r[P2]-r[P1]"),
37758	/* 109 / "Multiply" OpHelp("r[P3]=r[P1]r[P2]"),
37759	/* 110 */ "Divide" OpHelp("r[P3]=r[P2]/r[P1]"),
37760	/* 111 */ "Remainder" OpHelp("r[P3]=r[P2]%r[P1]"),
37761	/* 112 */ "Concat" OpHelp("r[P3]=r[P2]+r[P1]"),
37762	/* 113 */ "OpenWrite" OpHelp("root=P2 iDb=P3"),
37763	/* 114 */ "OpenDup" OpHelp(""),
37764	/* 115 */ "BitNot" OpHelp("r[P2]= ~r[P1]"),
37765	/* 116 */ "OpenAutoindex" OpHelp("nColumn=P2"),
37766	/* 117 */ "OpenEphemeral" OpHelp("nColumn=P2"),
37767	/* 118 */ "String8" OpHelp("r[P2]='P4'"),
37768	/* 119 */ "SorterOpen" OpHelp(""),
37769	/* 120 */ "SequenceTest" OpHelp("if( cursor[P1].ctr++ ) pc = P2"),
37770	/* 121 */ "OpenPseudo" OpHelp("P3 columns in r[P2]"),
37771	/* 122 */ "Close" OpHelp(""),
37772	/* 123 */ "ColumnsUsed" OpHelp(""),
37773	/* 124 */ "SeekScan" OpHelp("Scan-ahead up to P1 rows"),
37774	/* 125 */ "SeekHit" OpHelp("set P2<=seekHit<=P3"),
37775	/* 126 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"),
37776	/* 127 */ "NewRowid" OpHelp("r[P2]=rowid"),
37777	/* 128 */ "Insert" OpHelp("intkey=r[P3] data=r[P2]"),
37778	/* 129 */ "RowCell" OpHelp(""),
37779	/* 130 */ "Delete" OpHelp(""),
37780	/* 131 */ "ResetCount" OpHelp(""),
37781	/* 132 */ "SorterCompare" OpHelp("if key(P1)!=trim(r[P3],P4) goto P2"),
37782	/* 133 */ "SorterData" OpHelp("r[P2]=data"),
37783	/* 134 */ "RowData" OpHelp("r[P2]=data"),
37784	/* 135 */ "Rowid" OpHelp("r[P2]=PX rowid of P1"),
37785	/* 136 */ "NullRow" OpHelp(""),
37786	/* 137 */ "SeekEnd" OpHelp(""),
37787	/* 138 */ "IdxInsert" OpHelp("key=r[P2]"),
37788	/* 139 */ "SorterInsert" OpHelp("key=r[P2]"),
37789	/* 140 */ "IdxDelete" OpHelp("key=r[P2@P3]"),
37790	/* 141 */ "DeferredSeek" OpHelp("Move P3 to P1.rowid if needed"),
37791	/* 142 */ "IdxRowid" OpHelp("r[P2]=rowid"),
37792	/* 143 */ "FinishSeek" OpHelp(""),
37793	/* 144 */ "Destroy" OpHelp(""),
37794	/* 145 */ "Clear" OpHelp(""),
37795	/* 146 */ "ResetSorter" OpHelp(""),
37796	/* 147 */ "CreateBtree" OpHelp("r[P2]=root iDb=P1 flags=P3"),
37797	/* 148 */ "SqlExec" OpHelp(""),
37798	/* 149 */ "ParseSchema" OpHelp(""),
37799	/* 150 */ "LoadAnalysis" OpHelp(""),
37800	/* 151 */ "DropTable" OpHelp(""),
37801	/* 152 */ "DropIndex" OpHelp(""),
37802	/* 153 */ "DropTrigger" OpHelp(""),
37803	/* 154 */ "Real" OpHelp("r[P2]=P4"),
37804	/* 155 */ "IntegrityCk" OpHelp(""),
37805	/* 156 */ "RowSetAdd" OpHelp("rowset(P1)=r[P2]"),
37806	/* 157 */ "Param" OpHelp(""),
37807	/* 158 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
37808	/* 159 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
37809	/* 160 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"),
37810	/* 161 */ "AggInverse" OpHelp("accum=r[P3] inverse(r[P2@P5])"),
37811	/* 162 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"),
37812	/* 163 */ "AggStep1" OpHelp("accum=r[P3] step(r[P2@P5])"),
37813	/* 164 */ "AggValue" OpHelp("r[P3]=value N=P2"),
37814	/* 165 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
37815	/* 166 */ "Expire" OpHelp(""),
37816	/* 167 */ "CursorLock" OpHelp(""),
37817	/* 168 */ "CursorUnlock" OpHelp(""),
37818	/* 169 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
37819	/* 170 */ "VBegin" OpHelp(""),
37820	/* 171 */ "VCreate" OpHelp(""),
37821	/* 172 */ "VDestroy" OpHelp(""),
37822	/* 173 */ "VOpen" OpHelp(""),
37823	/* 174 */ "VCheck" OpHelp(""),
37824	/* 175 */ "VInitIn" OpHelp("r[P2]=ValueList(P1,P3)"),
37825	/* 176 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
37826	/* 177 */ "VRename" OpHelp(""),
37827	/* 178 */ "Pagecount" OpHelp(""),
37828	/* 179 */ "MaxPgcnt" OpHelp(""),
37829	/* 180 */ "ClrSubtype" OpHelp("r[P1].subtype = 0"),
37830	/* 181 */ "GetSubtype" OpHelp("r[P2] = r[P1].subtype"),
37831	/* 182 */ "SetSubtype" OpHelp("r[P2].subtype = r[P1]"),
37832	/* 183 */ "FilterAdd" OpHelp("filter(P1) += key(P3@P4)"),
37833	/* 184 */ "Trace" OpHelp(""),
37834	/* 185 */ "CursorHint" OpHelp(""),
37835	/* 186 */ "ReleaseReg" OpHelp("release r[P1@P2] mask P3"),
37836	/* 187 */ "Noop" OpHelp(""),
37837	/* 188 */ "Explain" OpHelp(""),
37838	/* 189 */ "Abortable" OpHelp(""),

37839	};
37840	return azName[i];
37841	}
37842	#endif
37843
	@@ -43860,25 +43951,24 @@
43860	assert( pShmNode->hShm<0 \|\| pDbFd->pInode->bProcessLock==0 );
43861
43862	/* Check that, if this to be a blocking lock, no locks that occur later
43863	** in the following list than the lock being obtained are already held:
43864	**
43865	** 1. Checkpointer lock (ofst==1).
43866	** 2. Write lock (ofst==0).
43867	** 3. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).

43868	**
43869	** In other words, if this is a blocking lock, none of the locks that
43870	** occur later in the above list than the lock being obtained may be
43871	** held.
43872	**
43873	** It is not permitted to block on the RECOVER lock.
43874	*/
43875	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
43876	{
43877	u16 lockMask = (p->exclMask\|p->sharedMask);
43878	assert( (flags & SQLITE_SHM_UNLOCK) \|\| pDbFd->iBusyTimeout==0 \|\| (
43879	(ofst!=2) /* not RECOVER */
43880	&& (ofst!=1 \|\| lockMask==0 \|\| lockMask==2)
43881	&& (ofst!=0 \|\| lockMask<3)
43882	&& (ofst<3 \|\| lockMask<(1<<ofst))
43883	));
43884	}
	@@ -49835,11 +49925,15 @@
49835	DWORD nDelay = (nMs==0 ? INFINITE : nMs);
49836	DWORD res = osWaitForSingleObject(ovlp.hEvent, nDelay);
49837	if( res==WAIT_OBJECT_0 ){
49838	ret = TRUE;
49839	}else if( res==WAIT_TIMEOUT ){

49840	rc = SQLITE_BUSY_TIMEOUT;



49841	}else{
49842	/* Some other error has occurred */
49843	rc = SQLITE_IOERR_LOCK;
49844	}
49845
	@@ -51321,17 +51415,17 @@
51321	int nChar;
51322	LPWSTR zWideFilename;
51323
51324	if( osCygwin_conv_path && !(winIsDriveLetterAndColon(zFilename)
51325	&& winIsDirSep(zFilename[2])) ){
51326	int nByte;
51327	int convertflag = CCP_POSIX_TO_WIN_W;
51328	if( !strchr(zFilename, '/') ) convertflag \|= CCP_RELATIVE;
51329	nByte = (int)osCygwin_conv_path(convertflag,
51330	zFilename, 0, 0);
51331	if( nByte>0 ){
51332	zConverted = sqlite3MallocZero(nByte+12);
51333	if ( zConverted==0 ){
51334	return zConverted;
51335	}
51336	zWideFilename = zConverted;
51337	/* Filenames should be prefixed, except when converted
	@@ -51646,25 +51740,24 @@
51646	assert( n==1 \|\| (flags & SQLITE_SHM_EXCLUSIVE)!=0 );
51647
51648	/* Check that, if this to be a blocking lock, no locks that occur later
51649	** in the following list than the lock being obtained are already held:
51650	**
51651	** 1. Checkpointer lock (ofst==1).
51652	** 2. Write lock (ofst==0).
51653	** 3. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).

51654	**
51655	** In other words, if this is a blocking lock, none of the locks that
51656	** occur later in the above list than the lock being obtained may be
51657	** held.
51658	**
51659	** It is not permitted to block on the RECOVER lock.
51660	*/
51661	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
51662	{
51663	u16 lockMask = (p->exclMask\|p->sharedMask);
51664	assert( (flags & SQLITE_SHM_UNLOCK) \|\| pDbFd->iBusyTimeout==0 \|\| (
51665	(ofst!=2) /* not RECOVER */
51666	&& (ofst!=1 \|\| lockMask==0 \|\| lockMask==2)
51667	&& (ofst!=0 \|\| lockMask<3)
51668	&& (ofst<3 \|\| lockMask<(1<<ofst))
51669	));
51670	}
	@@ -52210,31 +52303,10 @@
52210	**
52211	** This division contains the implementation of methods on the
52212	** sqlite3_vfs object.
52213	*/
52214
52215	#if 0 /* No longer necessary */
52216	/*
52217	** Convert a filename from whatever the underlying operating system
52218	** supports for filenames into UTF-8. Space to hold the result is
52219	** obtained from malloc and must be freed by the calling function.
52220	*/
52221	static char winConvertToUtf8Filename(const void zFilename){
52222	char *zConverted = 0;
52223	if( osIsNT() ){
52224	zConverted = winUnicodeToUtf8(zFilename);
52225	}
52226	#ifdef SQLITE_WIN32_HAS_ANSI
52227	else{
52228	zConverted = winMbcsToUtf8(zFilename, osAreFileApisANSI());
52229	}
52230	#endif
52231	/* caller will handle out of memory */
52232	return zConverted;
52233	}
52234	#endif
52235
52236	/*
52237	** This function returns non-zero if the specified UTF-8 string buffer
52238	** ends with a directory separator character or one was successfully
52239	** added to it.
52240	*/
	@@ -52370,46 +52442,10 @@
52370	sqlite3_snprintf(nMax, zBuf, "%s", zDir);
52371	sqlite3_free(zConverted);
52372	break;
52373	}
52374	sqlite3_free(zConverted);
52375	#if 0 /* No longer necessary */
52376	}else{
52377	zConverted = sqlite3MallocZero( nMax+1 );
52378	if( !zConverted ){
52379	sqlite3_free(zBuf);
52380	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
52381	return SQLITE_IOERR_NOMEM_BKPT;
52382	}
52383	if( osCygwin_conv_path(
52384	CCP_POSIX_TO_WIN_W, zDir,
52385	zConverted, nMax+1)<0 ){
52386	sqlite3_free(zConverted);
52387	sqlite3_free(zBuf);
52388	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_CONVPATH\n"));
52389	return winLogError(SQLITE_IOERR_CONVPATH, (DWORD)errno,
52390	"winGetTempname2", zDir);
52391	}
52392	if( winIsDir(zConverted) ){
52393	/* At this point, we know the candidate directory exists and should
52394	** be used. However, we may need to convert the string containing
52395	** its name into UTF-8 (i.e. if it is UTF-16 right now).
52396	*/
52397	char *zUtf8 = winConvertToUtf8Filename(zConverted);
52398	if( !zUtf8 ){
52399	sqlite3_free(zConverted);
52400	sqlite3_free(zBuf);
52401	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
52402	return SQLITE_IOERR_NOMEM_BKPT;
52403	}
52404	sqlite3_snprintf(nMax, zBuf, "%s", zUtf8);
52405	sqlite3_free(zUtf8);
52406	sqlite3_free(zConverted);
52407	break;
52408	}
52409	sqlite3_free(zConverted);
52410	#endif /* No longer necessary */
52411	}
52412	}
52413	}
52414	#endif
52415
	@@ -53304,38 +53340,10 @@
53304	winSimplifyName(zFull);
53305	return rc;
53306	}
53307	}
53308	#endif /* __CYGWIN__ */
53309	#if 0 /* This doesn't work correctly at all! See:
53310	<https://marc.info/?l=sqlite-users&m=139299149416314&w=2>
53311	*/
53312	SimulateIOError( return SQLITE_ERROR );
53313	UNUSED_PARAMETER(nFull);
53314	assert( nFull>=pVfs->mxPathname );
53315	char *zOut = sqlite3MallocZero( pVfs->mxPathname+1 );
53316	if( !zOut ){
53317	return SQLITE_IOERR_NOMEM_BKPT;
53318	}
53319	if( osCygwin_conv_path(
53320	CCP_POSIX_TO_WIN_W,
53321	zRelative, zOut, pVfs->mxPathname+1)<0 ){
53322	sqlite3_free(zOut);
53323	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
53324	"winFullPathname2", zRelative);
53325	}else{
53326	char *zUtf8 = winConvertToUtf8Filename(zOut);
53327	if( !zUtf8 ){
53328	sqlite3_free(zOut);
53329	return SQLITE_IOERR_NOMEM_BKPT;
53330	}
53331	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zUtf8);
53332	sqlite3_free(zUtf8);
53333	sqlite3_free(zOut);
53334	}
53335	return SQLITE_OK;
53336	#endif
53337
53338	#if (SQLITE_OS_WINCE \|\| SQLITE_OS_WINRT) && defined(_WIN32)
53339	SimulateIOError( return SQLITE_ERROR );
53340	/* WinCE has no concept of a relative pathname, or so I am told. */
53341	/* WinRT has no way to convert a relative path to an absolute one. */
	@@ -53477,31 +53485,12 @@
53477	** Interfaces for opening a shared library, finding entry points
53478	** within the shared library, and closing the shared library.
53479	*/
53480	static void winDlOpen(sqlite3_vfs pVfs, const char *zFilename){
53481	HANDLE h;
53482	#if 0 /* This doesn't work correctly at all! See:
53483	<https://marc.info/?l=sqlite-users&m=139299149416314&w=2>
53484	*/
53485	int nFull = pVfs->mxPathname+1;
53486	char *zFull = sqlite3MallocZero( nFull );
53487	void *zConverted = 0;
53488	if( zFull==0 ){
53489	OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53490	return 0;
53491	}
53492	if( winFullPathname(pVfs, zFilename, nFull, zFull)!=SQLITE_OK ){
53493	sqlite3_free(zFull);
53494	OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53495	return 0;
53496	}
53497	zConverted = winConvertFromUtf8Filename(zFull);
53498	sqlite3_free(zFull);
53499	#else
53500	void *zConverted = winConvertFromUtf8Filename(zFilename);
53501	UNUSED_PARAMETER(pVfs);
53502	#endif
53503	if( zConverted==0 ){
53504	OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53505	return 0;
53506	}
53507	if( osIsNT() ){
	@@ -54943,10 +54932,11 @@
54943	BITVEC_TELEM aBitmap[BITVEC_NELEM]; /* Bitmap representation */
54944	u32 aHash[BITVEC_NINT]; /* Hash table representation */
54945	Bitvec apSub[BITVEC_NPTR]; / Recursive representation */
54946	} u;
54947	};

54948
54949	/*
54950	** Create a new bitmap object able to handle bits between 0 and iSize,
54951	** inclusive. Return a pointer to the new object. Return NULL if
54952	** malloc fails.
	@@ -55053,11 +55043,13 @@
55053	if( aiValues==0 ){
55054	return SQLITE_NOMEM_BKPT;
55055	}else{
55056	memcpy(aiValues, p->u.aHash, sizeof(p->u.aHash));
55057	memset(p->u.apSub, 0, sizeof(p->u.apSub));
55058	p->iDivisor = (p->iSize + BITVEC_NPTR - 1)/BITVEC_NPTR;


55059	rc = sqlite3BitvecSet(p, i);
55060	for(j=0; j<BITVEC_NINT; j++){
55061	if( aiValues[j] ) rc \|= sqlite3BitvecSet(p, aiValues[j]);
55062	}
55063	sqlite3StackFree(0, aiValues);
	@@ -55129,10 +55121,56 @@
55129	** was created.
55130	*/
55131	SQLITE_PRIVATE u32 sqlite3BitvecSize(Bitvec *p){
55132	return p->iSize;
55133	}














































55134
55135	#ifndef SQLITE_UNTESTABLE
55136	/*
55137	** Let V[] be an array of unsigned characters sufficient to hold
55138	** up to N bits. Let I be an integer between 0 and N. 0<=I<N.
	@@ -55140,40 +55178,48 @@
55140	** individual bits within V.
55141	*/
55142	#define SETBIT(V,I) V[I>>3] \|= (1<<(I&7))
55143	#define CLEARBIT(V,I) V[I>>3] &= ~(BITVEC_TELEM)(1<<(I&7))
55144	#define TESTBIT(V,I) (V[I>>3]&(1<<(I&7)))!=0

55145
55146	/*
55147	** This routine runs an extensive test of the Bitvec code.
55148	**
55149	** The input is an array of integers that acts as a program
55150	** to test the Bitvec. The integers are opcodes followed
55151	** by 0, 1, or 3 operands, depending on the opcode. Another
55152	** opcode follows immediately after the last operand.
55153	**
55154	** There are 6 opcodes numbered from 0 through 5. 0 is the
55155	** "halt" opcode and causes the test to end.
55156	**
55157	** 0 Halt and return the number of errors
55158	** 1 N S X Set N bits beginning with S and incrementing by X
55159	** 2 N S X Clear N bits beginning with S and incrementing by X
55160	** 3 N Set N randomly chosen bits
55161	** 4 N Clear N randomly chosen bits
55162	** 5 N S X Set N bits from S increment X in array only, not in bitvec


55163	**
55164	** The opcodes 1 through 4 perform set and clear operations are performed
55165	** on both a Bitvec object and on a linear array of bits obtained from malloc.
55166	** Opcode 5 works on the linear array only, not on the Bitvec.
55167	** Opcode 5 is used to deliberately induce a fault in order to
55168	** confirm that error detection works.


55169	**
55170	** At the conclusion of the test the linear array is compared
55171	** against the Bitvec object. If there are any differences,
55172	** an error is returned. If they are the same, zero is returned.
55173	**
55174	** If a memory allocation error occurs, return -1.



55175	*/
55176	SQLITE_PRIVATE int sqlite3BitvecBuiltinTest(int sz, int *aOp){
55177	Bitvec *pBitvec = 0;
55178	unsigned char *pV = 0;
55179	int rc = -1;
	@@ -55180,22 +55226,45 @@
55180	int i, nx, pc, op;
55181	void *pTmpSpace;
55182
55183	/* Allocate the Bitvec to be tested and a linear array of
55184	** bits to act as the reference */
55185	pBitvec = sqlite3BitvecCreate( sz );
55186	pV = sqlite3MallocZero( (7+(i64)sz)/8 + 1 );





55187	pTmpSpace = sqlite3_malloc64(BITVEC_SZ);
55188	if( pBitvec==0 \|\| pV==0 \|\| pTmpSpace==0 ) goto bitvec_end;
55189
55190	/* NULL pBitvec tests */
55191	sqlite3BitvecSet(0, 1);
55192	sqlite3BitvecClear(0, 1, pTmpSpace);
55193
55194	/* Run the program */
55195	pc = i = 0;
55196	while( (op = aOp[pc])!=0 ){


















55197	switch( op ){
55198	case 1:
55199	case 2:
55200	case 5: {
55201	nx = 4;
	@@ -55213,33 +55282,37 @@
55213	}
55214	if( (--aOp[pc+1]) > 0 ) nx = 0;
55215	pc += nx;
55216	i = (i & 0x7fffffff)%sz;
55217	if( (op & 1)!=0 ){
55218	SETBIT(pV, (i+1));
55219	if( op!=5 ){
55220	if( sqlite3BitvecSet(pBitvec, i+1) ) goto bitvec_end;
55221	}
55222	}else{
55223	CLEARBIT(pV, (i+1));
55224	sqlite3BitvecClear(pBitvec, i+1, pTmpSpace);
55225	}
55226	}
55227
55228	/* Test to make sure the linear array exactly matches the
55229	** Bitvec object. Start with the assumption that they do
55230	** match (rc==0). Change rc to non-zero if a discrepancy
55231	** is found.
55232	*/
55233	rc = sqlite3BitvecTest(0,0) + sqlite3BitvecTest(pBitvec, sz+1)
55234	+ sqlite3BitvecTest(pBitvec, 0)
55235	+ (sqlite3BitvecSize(pBitvec) - sz);
55236	for(i=1; i<=sz; i++){
55237	if( (TESTBIT(pV,i))!=sqlite3BitvecTest(pBitvec,i) ){
55238	rc = i;
55239	break;
55240	}




55241	}
55242
55243	/* Free allocated structure */
55244	bitvec_end:
55245	sqlite3_free(pTmpSpace);
	@@ -58839,10 +58912,13 @@
58839	char pTmpSpace; / Pager.pageSize bytes of space for tmp use */
58840	PCache pPCache; / Pointer to page cache object */
58841	#ifndef SQLITE_OMIT_WAL
58842	Wal pWal; / Write-ahead log used by "journal_mode=wal" */
58843	char zWal; / File name for write-ahead log */



58844	#endif
58845	};
58846
58847	/*
58848	** Indexes for use with Pager.aStat[]. The Pager.aStat[] array contains
	@@ -65721,10 +65797,15 @@
65721	if( rc==SQLITE_OK ){
65722	rc = sqlite3WalOpen(pPager->pVfs,
65723	pPager->fd, pPager->zWal, pPager->exclusiveMode,
65724	pPager->journalSizeLimit, &pPager->pWal
65725	);





65726	}
65727	pagerFixMaplimit(pPager);
65728
65729	return rc;
65730	}
	@@ -65840,10 +65921,11 @@
65840	/*
65841	** Set the database handle used by the wal layer to determine if
65842	** blocking locks are required.
65843	*/
65844	SQLITE_PRIVATE void sqlite3PagerWalDb(Pager pPager, sqlite3 db){

65845	if( pagerUseWal(pPager) ){
65846	sqlite3WalDb(pPager->pWal, db);
65847	}
65848	}
65849	#endif
	@@ -69013,11 +69095,10 @@
69013	assert( rc==SQLITE_OK );
69014	if( pWal->bShmUnreliable==0 ){
69015	rc = walIndexReadHdr(pWal, pChanged);
69016	}
69017	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
69018	walDisableBlocking(pWal);
69019	if( rc==SQLITE_BUSY_TIMEOUT ){
69020	rc = SQLITE_BUSY;
69021	*pCnt \|= WAL_RETRY_BLOCKED_MASK;
69022	}
69023	#endif
	@@ -69028,10 +69109,11 @@
69028	** which might cause WAL_RETRY to be returned even if BUSY_RECOVERY
69029	** would be technically correct. But the race is benign since with
69030	** WAL_RETRY this routine will be called again and will probably be
69031	** right on the second iteration.
69032	*/

69033	if( pWal->apWiData[0]==0 ){
69034	/* This branch is taken when the xShmMap() method returns SQLITE_BUSY.
69035	** We assume this is a transient condition, so return WAL_RETRY. The
69036	** xShmMap() implementation used by the default unix and win32 VFS
69037	** modules may return SQLITE_BUSY due to a race condition in the
	@@ -69044,10 +69126,11 @@
69044	rc = WAL_RETRY;
69045	}else if( rc==SQLITE_BUSY ){
69046	rc = SQLITE_BUSY_RECOVERY;
69047	}
69048	}

69049	if( rc!=SQLITE_OK ){
69050	return rc;
69051	}
69052	else if( pWal->bShmUnreliable ){
69053	return walBeginShmUnreliable(pWal, pChanged);
	@@ -69731,10 +69814,11 @@
69731	rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
69732	}
69733	if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
69734	}
69735	SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )

69736	}
69737	return rc;
69738	}
69739
69740	/*
	@@ -69778,10 +69862,13 @@
69778	pWal->hdr.aFrameCksum[1] = aWalData[2];
69779	SEH_TRY {
69780	walCleanupHash(pWal);
69781	}
69782	SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )



69783	}
69784
69785	return rc;
69786	}
69787
	@@ -72493,11 +72580,11 @@
72493	if( pKey ){
72494	KeyInfo *pKeyInfo = pCur->pKeyInfo;
72495	assert( nKey==(i64)(int)nKey );
72496	pIdxKey = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
72497	if( pIdxKey==0 ) return SQLITE_NOMEM_BKPT;
72498	sqlite3VdbeRecordUnpack(pKeyInfo, (int)nKey, pKey, pIdxKey);
72499	if( pIdxKey->nField==0 \|\| pIdxKey->nField>pKeyInfo->nAllField ){
72500	rc = SQLITE_CORRUPT_BKPT;
72501	}else{
72502	rc = sqlite3BtreeIndexMoveto(pCur, pIdxKey, pRes);
72503	}
	@@ -73550,14 +73637,14 @@
73550	u8 pTmp; / Temporary ptr into data[] */
73551
73552	assert( pPage->pBt!=0 );
73553	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
73554	assert( CORRUPT_DB \|\| iStart>=pPage->hdrOffset+6+pPage->childPtrSize );
73555	assert( CORRUPT_DB \|\| iEnd <= pPage->pBt->usableSize );
73556	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
73557	assert( iSize>=4 ); /* Minimum cell size is 4 */
73558	assert( CORRUPT_DB \|\| iStart<=pPage->pBt->usableSize-4 );
73559
73560	/* The list of freeblocks must be in ascending order. Find the
73561	** spot on the list where iStart should be inserted.
73562	*/
73563	hdr = pPage->hdrOffset;
	@@ -74477,10 +74564,11 @@
74477	removed = 1;
74478	}
74479	sqlite3_mutex_leave(pMainMtx);
74480	return removed;
74481	#else

74482	return 1;
74483	#endif
74484	}
74485
74486	/*
	@@ -74694,10 +74782,14 @@
74694	BtShared *pBt = p->pBt;
74695	assert( nReserve>=0 && nReserve<=255 );
74696	sqlite3BtreeEnter(p);
74697	pBt->nReserveWanted = (u8)nReserve;
74698	x = pBt->pageSize - pBt->usableSize;




74699	if( nReserve<x ) nReserve = x;
74700	if( pBt->btsFlags & BTS_PAGESIZE_FIXED ){
74701	sqlite3BtreeLeave(p);
74702	return SQLITE_READONLY;
74703	}
	@@ -75318,10 +75410,17 @@
75318
75319	if( rc!=SQLITE_OK ){
75320	(void)sqlite3PagerWalWriteLock(pPager, 0);
75321	unlockBtreeIfUnused(pBt);
75322	}







75323	}while( (rc&0xFF)==SQLITE_BUSY && pBt->inTransaction==TRANS_NONE &&
75324	btreeInvokeBusyHandler(pBt) );
75325	sqlite3PagerWalDb(pPager, 0);
75326	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
75327	if( rc==SQLITE_BUSY_TIMEOUT ) rc = SQLITE_BUSY;
	@@ -77275,10 +77374,34 @@
77275	*pRes = 1;
77276	rc = SQLITE_OK;
77277	}
77278	return rc;
77279	}
























77280
77281	#ifdef SQLITE_DEBUG
77282	/* The cursors is CURSOR_VALID and has BTCF_AtLast set. Verify that
77283	** this flags are true for a consistent database.
77284	**
	@@ -77495,12 +77618,12 @@
77495	assert( (pCur->curFlags & BTCF_ValidOvfl)==0 );
77496	return rc;
77497	}
77498
77499	/*
77500	** Compare the "idx"-th cell on the page the cursor pCur is currently
77501	** pointing to to pIdxKey using xRecordCompare. Return negative or
77502	** zero if the cell is less than or equal pIdxKey. Return positive
77503	** if unknown.
77504	**
77505	** Return value negative: Cell at pCur[idx] less than pIdxKey
77506	**
	@@ -77511,16 +77634,15 @@
77511	**
77512	** This routine is part of an optimization. It is always safe to return
77513	** a positive value as that will cause the optimization to be skipped.
77514	*/
77515	static int indexCellCompare(
77516	BtCursor *pCur,
77517	int idx,
77518	UnpackedRecord *pIdxKey,
77519	RecordCompare xRecordCompare
77520	){
77521	MemPage *pPage = pCur->pPage;
77522	int c;
77523	int nCell; /* Size of the pCell cell in bytes */
77524	u8 *pCell = findCellPastPtr(pPage, idx);
77525
77526	nCell = pCell[0];
	@@ -77625,18 +77747,18 @@
77625	&& pCur->pPage->leaf
77626	&& cursorOnLastPage(pCur)
77627	){
77628	int c;
77629	if( pCur->ix==pCur->pPage->nCell-1
77630	&& (c = indexCellCompare(pCur, pCur->ix, pIdxKey, xRecordCompare))<=0
77631	&& pIdxKey->errCode==SQLITE_OK
77632	){
77633	*pRes = c;
77634	return SQLITE_OK; /* Cursor already pointing at the correct spot */
77635	}
77636	if( pCur->iPage>0
77637	&& indexCellCompare(pCur, 0, pIdxKey, xRecordCompare)<=0
77638	&& pIdxKey->errCode==SQLITE_OK
77639	){
77640	pCur->curFlags &= ~(BTCF_ValidOvfl\|BTCF_AtLast);
77641	if( !pCur->pPage->isInit ){
77642	return SQLITE_CORRUPT_BKPT;
	@@ -77849,11 +77971,11 @@
77849	if( pCur->eState!=CURSOR_VALID ) return 0;
77850	if( NEVER(pCur->pPage->leaf==0) ) return -1;
77851
77852	n = pCur->pPage->nCell;
77853	for(i=0; i<pCur->iPage; i++){
77854	n *= pCur->apPage[i]->nCell;
77855	}
77856	return n;
77857	}
77858
77859	/*
	@@ -80306,11 +80428,16 @@
80306
80307	/* If the sibling pages are not leaves, ensure that the right-child pointer
80308	** of the right-most new sibling page is set to the value that was
80309	** originally in the same field of the right-most old sibling page. */
80310	if( (pageFlags & PTF_LEAF)==0 && nOld!=nNew ){
80311	MemPage *pOld = (nNew>nOld ? apNew : apOld)[nOld-1];





80312	memcpy(&apNew[nNew-1]->aData[8], &pOld->aData[8], 4);
80313	}
80314
80315	/* Make any required updates to pointer map entries associated with
80316	** cells stored on sibling pages following the balance operation. Pointer
	@@ -82938,10 +83065,11 @@
82938	** btree as the argument handle holds an exclusive lock on the
82939	** sqlite_schema table. Otherwise SQLITE_OK.
82940	*/
82941	SQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *p){
82942	int rc;

82943	assert( sqlite3_mutex_held(p->db->mutex) );
82944	sqlite3BtreeEnter(p);
82945	rc = querySharedCacheTableLock(p, SCHEMA_ROOT, READ_LOCK);
82946	assert( rc==SQLITE_OK \|\| rc==SQLITE_LOCKED_SHAREDCACHE );
82947	sqlite3BtreeLeave(p);
	@@ -87262,10 +87390,13 @@
87262	** into register iDest, then add the OPFLAG_TYPEOFARG flag to that
87263	** opcode.
87264	*/
87265	SQLITE_PRIVATE void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
87266	VdbeOp *pOp = sqlite3VdbeGetLastOp(p);



87267	if( pOp->p3==iDest && pOp->opcode==OP_Column ){
87268	pOp->p5 \|= OPFLAG_TYPEOFARG;
87269	}
87270	}
87271
	@@ -90155,34 +90286,26 @@
90155	}
90156	}
90157	return;
90158	}
90159	/*
90160	** This routine is used to allocate sufficient space for an UnpackedRecord
90161	** structure large enough to be used with sqlite3VdbeRecordUnpack() if
90162	** the first argument is a pointer to KeyInfo structure pKeyInfo.
90163	**
90164	** The space is either allocated using sqlite3DbMallocRaw() or from within
90165	** the unaligned buffer passed via the second and third arguments (presumably
90166	** stack space). If the former, then *ppFree is set to a pointer that should
90167	** be eventually freed by the caller using sqlite3DbFree(). Or, if the
90168	** allocation comes from the pSpace/szSpace buffer, *ppFree is set to NULL
90169	** before returning.
90170	**
90171	** If an OOM error occurs, NULL is returned.
90172	*/
90173	SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(
90174	KeyInfo pKeyInfo / Description of the record */
90175	){
90176	UnpackedRecord p; / Unpacked record to return */
90177	int nByte; /* Number of bytes required for p /
90178	assert( sizeof(UnpackedRecord) + sizeof(Mem)*65536 < 0x7fffffff );
90179	nByte = ROUND8P(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1);
90180	p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte);
90181	if( !p ) return 0;
90182	p->aMem = (Mem)&((char)p)[ROUND8P(sizeof(UnpackedRecord))];
90183	assert( pKeyInfo->aSortFlags!=0 );
90184	p->pKeyInfo = pKeyInfo;
90185	p->nField = pKeyInfo->nKeyField + 1;
90186	return p;
90187	}
90188
	@@ -90190,11 +90313,10 @@
90190	** Given the nKey-byte encoding of a record in pKey[], populate the
90191	** UnpackedRecord structure indicated by the fourth argument with the
90192	** contents of the decoded record.
90193	*/
90194	SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(
90195	KeyInfo pKeyInfo, / Information about the record format */
90196	int nKey, /* Size of the binary record */
90197	const void pKey, / The binary record */
90198	UnpackedRecord p / Populate this structure before returning. */
90199	){
90200	const unsigned char aKey = (const unsigned char )pKey;
	@@ -90201,10 +90323,11 @@
90201	u32 d;
90202	u32 idx; /* Offset in aKey[] to read from */
90203	u16 u; /* Unsigned loop counter */
90204	u32 szHdr;
90205	Mem *pMem = p->aMem;

90206
90207	p->default_rc = 0;
90208	assert( EIGHT_BYTE_ALIGNMENT(pMem) );
90209	idx = getVarint32(aKey, szHdr);
90210	d = szHdr;
	@@ -90228,10 +90351,12 @@
90228	/* In a corrupt record entry, the last pMem might have been set up using
90229	** uninitialized memory. Overwrite its value with NULL, to prevent
90230	** warnings from MSAN. */
90231	sqlite3VdbeMemSetNull(pMem-1);
90232	}


90233	assert( u<=pKeyInfo->nKeyField + 1 );
90234	p->nField = u;
90235	}
90236
90237	#ifdef SQLITE_DEBUG
	@@ -91087,10 +91212,11 @@
91087	** is an integer.
91088	**
91089	** The easiest way to enforce this limit is to consider only records with
91090	** 13 fields or less. If the first field is an integer, the maximum legal
91091	** header size is (125 + 1 + 1) bytes. /

91092	if( p->pKeyInfo->nAllField<=13 ){
91093	int flags = p->aMem[0].flags;
91094	if( p->pKeyInfo->aSortFlags[0] ){
91095	if( p->pKeyInfo->aSortFlags[0] & KEYINFO_ORDER_BIGNULL ){
91096	return sqlite3VdbeRecordCompare;
	@@ -91336,10 +91462,11 @@
91336	}else{
91337	v->expmask \|= ((u32)1 << (iVar-1));
91338	}
91339	}
91340

91341	/*
91342	** Cause a function to throw an error if it was call from OP_PureFunc
91343	** rather than OP_Function.
91344	**
91345	** OP_PureFunc means that the function must be deterministic, and should
	@@ -91369,10 +91496,11 @@
91369	sqlite3_free(zMsg);
91370	return 0;
91371	}
91372	return 1;
91373	}

91374
91375	#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
91376	/*
91377	** This Walker callback is used to help verify that calls to
91378	** sqlite3BtreeCursorHint() with opcode BTREE_HINT_RANGE have
	@@ -91445,11 +91573,10 @@
91445	){
91446	sqlite3 *db = v->db;
91447	i64 iKey2;
91448	PreUpdate preupdate;
91449	const char *zTbl = pTab->zName;
91450	static const u8 fakeSortOrder = 0;
91451	#ifdef SQLITE_DEBUG
91452	int nRealCol;
91453	if( pTab->tabFlags & TF_WithoutRowid ){
91454	nRealCol = sqlite3PrimaryKeyIndex(pTab)->nColumn;
91455	}else if( pTab->tabFlags & TF_HasVirtual ){
	@@ -91484,11 +91611,11 @@
91484	preupdate.iNewReg = iReg;
91485	preupdate.pKeyinfo = (KeyInfo*)&preupdate.keyinfoSpace;
91486	preupdate.pKeyinfo->db = db;
91487	preupdate.pKeyinfo->enc = ENC(db);
91488	preupdate.pKeyinfo->nKeyField = pTab->nCol;
91489	preupdate.pKeyinfo->aSortFlags = (u8*)&fakeSortOrder;
91490	preupdate.iKey1 = iKey1;
91491	preupdate.iKey2 = iKey2;
91492	preupdate.pTab = pTab;
91493	preupdate.iBlobWrite = iBlobWrite;
91494
	@@ -93681,11 +93808,11 @@
93681	UnpackedRecord pRet; / Return value */
93682
93683	pRet = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
93684	if( pRet ){
93685	memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nKeyField+1));
93686	sqlite3VdbeRecordUnpack(pKeyInfo, nKey, pKey, pRet);
93687	}
93688	return pRet;
93689	}
93690
93691	/*
	@@ -93710,10 +93837,13 @@
93710	rc = SQLITE_MISUSE_BKPT;
93711	goto preupdate_old_out;
93712	}
93713	if( p->pPk ){
93714	iStore = sqlite3TableColumnToIndex(p->pPk, iIdx);



93715	}else{
93716	iStore = sqlite3TableColumnToStorage(p->pTab, iIdx);
93717	}
93718	if( iStore>=p->pCsr->nField \|\| iStore<0 ){
93719	rc = SQLITE_RANGE;
	@@ -93865,10 +93995,12 @@
93865	rc = SQLITE_MISUSE_BKPT;
93866	goto preupdate_new_out;
93867	}
93868	if( p->pPk && p->op!=SQLITE_UPDATE ){
93869	iStore = sqlite3TableColumnToIndex(p->pPk, iIdx);


93870	}else{
93871	iStore = sqlite3TableColumnToStorage(p->pTab, iIdx);
93872	}
93873
93874	if( iStore>=p->pCsr->nField \|\| iStore<0 ){
	@@ -95190,10 +95322,40 @@
95190	}
95191	pDest->flags &= ~MEM_Ephem;
95192	return rc;
95193	}
95194






























95195
95196	/*
95197	** Return the symbolic name for the data type of a pMem
95198	*/
95199	static const char vdbeMemTypeName(Mem pMem){
	@@ -95715,12 +95877,11 @@
95715	p->zErrMsg = sqlite3MPrintf(db, "%z: %s", p->zErrMsg, pOp->p4.z);
95716	}
95717	}else{
95718	sqlite3VdbeError(p, "%s", pOp->p4.z);
95719	}
95720	pcx = (int)(pOp - aOp);
95721	sqlite3_log(pOp->p1, "abort at %d in [%s]: %s", pcx, p->zSql, p->zErrMsg);
95722	}
95723	rc = sqlite3VdbeHalt(p);
95724	assert( rc==SQLITE_BUSY \|\| rc==SQLITE_OK \|\| rc==SQLITE_ERROR );
95725	if( rc==SQLITE_BUSY ){
95726	p->rc = SQLITE_BUSY;
	@@ -96874,10 +97035,11 @@
96874	}
96875	n = pOp->p3;
96876	pKeyInfo = pOp->p4.pKeyInfo;
96877	assert( n>0 );
96878	assert( pKeyInfo!=0 );

96879	p1 = pOp->p1;
96880	p2 = pOp->p2;
96881	#ifdef SQLITE_DEBUG
96882	if( aPermute ){
96883	int k, mx = 0;
	@@ -97042,11 +97204,11 @@
97042	pOut->u.i = ~sqlite3VdbeIntValue(pIn1);
97043	}
97044	break;
97045	}
97046
97047	/* Opcode: Once P1 P2 * * *
97048	**
97049	** Fall through to the next instruction the first time this opcode is
97050	** encountered on each invocation of the byte-code program. Jump to P2
97051	** on the second and all subsequent encounters during the same invocation.
97052	**
	@@ -97058,10 +97220,16 @@
97058	**
97059	** For subprograms, there is a bitmask in the VdbeFrame that determines
97060	** whether or not the jump should be taken. The bitmask is necessary
97061	** because the self-altering code trick does not work for recursive
97062	** triggers.






97063	*/
97064	case OP_Once: { /* jump */
97065	u32 iAddr; /* Address of this instruction */
97066	assert( p->aOp[0].opcode==OP_Init );
97067	if( p->pFrame ){
	@@ -97629,10 +97797,19 @@
97629	** Synopsis: typecheck(r[P1@P2])
97630	**
97631	** Apply affinities to the range of P2 registers beginning with P1.
97632	** Take the affinities from the Table object in P4. If any value
97633	** cannot be coerced into the correct type, then raise an error.









97634	**
97635	** This opcode is similar to OP_Affinity except that this opcode
97636	** forces the register type to the Table column type. This is used
97637	** to implement "strict affinity".
97638	**
	@@ -97643,30 +97820,42 @@
97643	**
97644	** Preconditions:
97645	**
97646	** <ul>
97647	** <li> P2 should be the number of non-virtual columns in the
97648	** table of P4.
97649	** <li> Table P4 should be a STRICT table.
97650	** </ul>
97651	**
97652	** If any precondition is false, an assertion fault occurs.
97653	*/
97654	case OP_TypeCheck: {
97655	Table *pTab;
97656	Column *aCol;
97657	int i;

97658
97659	assert( pOp->p4type==P4_TABLE );
97660	pTab = pOp->p4.pTab;
97661	assert( pTab->tabFlags & TF_Strict );
97662	assert( pTab->nNVCol==pOp->p2 );
97663	aCol = pTab->aCol;
97664	pIn1 = &aMem[pOp->p1];
97665	for(i=0; i<pTab->nCol; i++){
97666	if( aCol[i].colFlags & COLFLAG_GENERATED ){
97667	if( aCol[i].colFlags & COLFLAG_VIRTUAL ) continue;











97668	if( pOp->p3 ){ pIn1++; continue; }
97669	}
97670	assert( pIn1 < &aMem[pOp->p1+pOp->p2] );
97671	applyAffinity(pIn1, aCol[i].affinity, encoding);
97672	if( (pIn1->flags & MEM_Null)==0 ){
	@@ -98103,10 +98292,11 @@
98103	}
98104	}else{
98105	zHdr += sqlite3PutVarint(zHdr, serial_type);
98106	if( pRec->n ){
98107	assert( pRec->z!=0 );

98108	memcpy(zPayload, pRec->z, pRec->n);
98109	zPayload += pRec->n;
98110	}
98111	}
98112	if( pRec==pLast ) break;
	@@ -99740,11 +99930,11 @@
99740	rc = ExpandBlob(r.aMem);
99741	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
99742	if( rc ) goto no_mem;
99743	pIdxKey = sqlite3VdbeAllocUnpackedRecord(pC->pKeyInfo);
99744	if( pIdxKey==0 ) goto no_mem;
99745	sqlite3VdbeRecordUnpack(pC->pKeyInfo, r.aMem->n, r.aMem->z, pIdxKey);
99746	pIdxKey->default_rc = 0;
99747	rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, pIdxKey, &pC->seekResult);
99748	sqlite3DbFreeNN(db, pIdxKey);
99749	}
99750	if( rc!=SQLITE_OK ){
	@@ -100737,10 +100927,36 @@
100737	VdbeBranchTaken(res!=0,2);
100738	if( res ) goto jump_to_p2;
100739	}
100740	break;
100741	}


























100742
100743	/* Opcode: Next P1 P2 P3 * P5
100744	**
100745	** Advance cursor P1 so that it points to the next key/data pair in its
100746	** table or index. If there are no more key/value pairs then fall through
	@@ -102609,11 +102825,18 @@
102609	sqlite3_vtab_cursor *pVCur;
102610	sqlite3_vtab *pVtab;
102611	const sqlite3_module *pModule;
102612
102613	assert( p->bIsReader );
102614	pCur = 0;







102615	pVCur = 0;
102616	pVtab = pOp->p4.pVtab->pVtab;
102617	if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
102618	rc = SQLITE_LOCKED;
102619	goto abort_due_to_error;
	@@ -103551,12 +103774,11 @@
103551	sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc));
103552	}
103553	p->rc = rc;
103554	sqlite3SystemError(db, rc);
103555	testcase( sqlite3GlobalConfig.xLog!=0 );
103556	sqlite3_log(rc, "statement aborts at %d: [%s] %s",
103557	(int)(pOp - aOp), p->zSql, p->zErrMsg);
103558	if( p->eVdbeState==VDBE_RUN_STATE ) sqlite3VdbeHalt(p);
103559	if( rc==SQLITE_IOERR_NOMEM ) sqlite3OomFault(db);
103560	if( rc==SQLITE_CORRUPT && db->autoCommit==0 ){
103561	db->flags \|= SQLITE_CorruptRdOnly;
103562	}
	@@ -104013,11 +104235,11 @@
104013	void *z,
104014	int n,
104015	int iOffset,
104016	int (xCall)(BtCursor, u32, u32, void*)
104017	){
104018	int rc;
104019	Incrblob p = (Incrblob )pBlob;
104020	Vdbe *v;
104021	sqlite3 *db;
104022
104023	if( p==0 ) return SQLITE_MISUSE_BKPT;
	@@ -104053,21 +104275,36 @@
104053	** same way as an SQLITE_DELETE (the SQLITE_DELETE code is actually
104054	** slightly more efficient). Since you cannot write to a PK column
104055	** using the incremental-blob API, this works. For the sessions module
104056	** anyhow.
104057	*/
104058	sqlite3_int64 iKey;
104059	iKey = sqlite3BtreeIntegerKey(p->pCsr);
104060	assert( v->apCsr[0]!=0 );
104061	assert( v->apCsr[0]->eCurType==CURTYPE_BTREE );
104062	sqlite3VdbePreUpdateHook(
104063	v, v->apCsr[0], SQLITE_DELETE, p->zDb, p->pTab, iKey, -1, p->iCol
104064	);
104065	}
104066	#endif
104067













104068	rc = xCall(p->pCsr, iOffset+p->iOffset, n, z);


104069	sqlite3BtreeLeaveCursor(p->pCsr);
104070	if( rc==SQLITE_ABORT ){
104071	sqlite3VdbeFinalize(v);
104072	p->pStmt = 0;
104073	}else{
	@@ -104916,11 +105153,11 @@
104916	const void pKey1, int nKey1, / Left side of comparison */
104917	const void pKey2, int nKey2 / Right side of comparison */
104918	){
104919	UnpackedRecord *r2 = pTask->pUnpacked;
104920	if( *pbKey2Cached==0 ){
104921	sqlite3VdbeRecordUnpack(pTask->pSorter->pKeyInfo, nKey2, pKey2, r2);
104922	*pbKey2Cached = 1;
104923	}
104924	return sqlite3VdbeRecordCompareWithSkip(nKey1, pKey1, r2, 1);
104925	}
104926
	@@ -104943,11 +105180,11 @@
104943	const void pKey1, int nKey1, / Left side of comparison */
104944	const void pKey2, int nKey2 / Right side of comparison */
104945	){
104946	UnpackedRecord *r2 = pTask->pUnpacked;
104947	if( !*pbKey2Cached ){
104948	sqlite3VdbeRecordUnpack(pTask->pSorter->pKeyInfo, nKey2, pKey2, r2);
104949	*pbKey2Cached = 1;
104950	}
104951	return sqlite3VdbeRecordCompare(nKey1, pKey1, r2);
104952	}
104953
	@@ -104983,10 +105220,11 @@
104983	res = vdbeSorterCompareTail(
104984	pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
104985	);
104986	}
104987	}else{

104988	assert( !(pTask->pSorter->pKeyInfo->aSortFlags[0]&KEYINFO_ORDER_BIGNULL) );
104989	if( pTask->pSorter->pKeyInfo->aSortFlags[0] ){
104990	res = res * -1;
104991	}
104992	}
	@@ -105046,10 +105284,11 @@
105046	}else{
105047	if( *v2 & 0x80 ) res = +1;
105048	}
105049	}
105050

105051	if( res==0 ){
105052	if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
105053	res = vdbeSorterCompareTail(
105054	pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
105055	);
	@@ -105119,11 +105358,12 @@
105119	assert( pCsr->pKeyInfo );
105120	assert( !pCsr->isEphemeral );
105121	assert( pCsr->eCurType==CURTYPE_SORTER );
105122	assert( sizeof(KeyInfo) + UMXV(pCsr->pKeyInfo->nKeyField)sizeof(CollSeq)
105123	< 0x7fffffff );
105124	szKeyInfo = SZ_KEYINFO(pCsr->pKeyInfo->nKeyField+1);

105125	sz = SZ_VDBESORTER(nWorker+1);
105126
105127	pSorter = (VdbeSorter*)sqlite3DbMallocZero(db, sz + szKeyInfo);
105128	pCsr->uc.pSorter = pSorter;
105129	if( pSorter==0 ){
	@@ -105133,11 +105373,16 @@
105133	pSorter->pKeyInfo = pKeyInfo = (KeyInfo)((u8)pSorter + sz);
105134	memcpy(pKeyInfo, pCsr->pKeyInfo, szKeyInfo);
105135	pKeyInfo->db = 0;
105136	if( nField && nWorker==0 ){
105137	pKeyInfo->nKeyField = nField;

105138	}




105139	sqlite3BtreeEnter(pBt);
105140	pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(pBt);
105141	sqlite3BtreeLeave(pBt);
105142	pSorter->nTask = nWorker + 1;
105143	pSorter->iPrev = (u8)(nWorker - 1);
	@@ -106913,11 +107158,11 @@
106913	r2->nField = nKeyCol;
106914	}
106915	assert( r2->nField==nKeyCol );
106916
106917	pKey = vdbeSorterRowkey(pSorter, &nKey);
106918	sqlite3VdbeRecordUnpack(pKeyInfo, nKey, pKey, r2);
106919	for(i=0; i<nKeyCol; i++){
106920	if( r2->aMem[i].flags & MEM_Null ){
106921	*pRes = -1;
106922	return SQLITE_OK;
106923	}
	@@ -109287,17 +109532,16 @@
109287	/* Clearly non-deterministic functions like random(), but also
109288	** date/time functions that use 'now', and other functions like
109289	** sqlite_version() that might change over time cannot be used
109290	** in an index or generated column. Curiously, they can be used
109291	** in a CHECK constraint. SQLServer, MySQL, and PostgreSQL all
109292	** all this. */
109293	sqlite3ResolveNotValid(pParse, pNC, "non-deterministic functions",
109294	NC_IdxExpr\|NC_PartIdx\|NC_GenCol, 0, pExpr);
109295	}else{
109296	assert( (NC_SelfRef & 0xff)==NC_SelfRef ); /* Must fit in 8 bits */
109297	pExpr->op2 = pNC->ncFlags & NC_SelfRef;
109298	if( pNC->ncFlags & NC_FromDDL ) ExprSetProperty(pExpr, EP_FromDDL);
109299	}
109300	if( (pDef->funcFlags & SQLITE_FUNC_INTERNAL)!=0
109301	&& pParse->nested==0
109302	&& (pParse->db->mDbFlags & DBFLAG_InternalFunc)==0
109303	){
	@@ -109309,10 +109553,11 @@
109309	pDef = 0;
109310	}else
109311	if( (pDef->funcFlags & (SQLITE_FUNC_DIRECT\|SQLITE_FUNC_UNSAFE))!=0
109312	&& !IN_RENAME_OBJECT
109313	){

109314	sqlite3ExprFunctionUsable(pParse, pExpr, pDef);
109315	}
109316	}
109317
109318	if( 0==IN_RENAME_OBJECT ){
	@@ -109443,22 +109688,25 @@
109443	** type of the function
109444	*/
109445	return WRC_Prune;
109446	}
109447	#ifndef SQLITE_OMIT_SUBQUERY

109448	case TK_SELECT:
109449	case TK_EXISTS: testcase( pExpr->op==TK_EXISTS );
109450	#endif
109451	case TK_IN: {
109452	testcase( pExpr->op==TK_IN );


109453	if( ExprUseXSelect(pExpr) ){
109454	int nRef = pNC->nRef;
109455	testcase( pNC->ncFlags & NC_IsCheck );
109456	testcase( pNC->ncFlags & NC_PartIdx );
109457	testcase( pNC->ncFlags & NC_IdxExpr );
109458	testcase( pNC->ncFlags & NC_GenCol );
109459	assert( pExpr->x.pSelect );

109460	if( pNC->ncFlags & NC_SelfRef ){
109461	notValidImpl(pParse, pNC, "subqueries", pExpr, pExpr);
109462	}else{
109463	sqlite3WalkSelect(pWalker, pExpr->x.pSelect);
109464	}
	@@ -110469,11 +110717,13 @@
110469	assert( pExpr->iTable==pExpr->pLeft->x.pSelect->pEList->nExpr );
110470	return sqlite3ExprAffinity(
110471	pExpr->pLeft->x.pSelect->pEList->a[pExpr->iColumn].pExpr
110472	);
110473	}
110474	if( op==TK_VECTOR ){


110475	assert( ExprUseXList(pExpr) );
110476	return sqlite3ExprAffinity(pExpr->x.pList->a[0].pExpr);
110477	}
110478	if( ExprHasProperty(pExpr, EP_Skip\|EP_IfNullRow) ){
110479	assert( pExpr->op==TK_COLLATE
	@@ -110662,11 +110912,13 @@
110662	}
110663	if( op==TK_CAST \|\| op==TK_UPLUS ){
110664	p = p->pLeft;
110665	continue;
110666	}
110667	if( op==TK_VECTOR ){


110668	assert( ExprUseXList(p) );
110669	p = p->x.pList->a[0].pExpr;
110670	continue;
110671	}
110672	if( op==TK_COLLATE ){
	@@ -111536,11 +111788,11 @@
111536	return pRight;
111537	}else if( pRight==0 ){
111538	return pLeft;
111539	}else{
111540	u32 f = pLeft->flags \| pRight->flags;
111541	if( (f&(EP_OuterON\|EP_InnerON\|EP_IsFalse))==EP_IsFalse
111542	&& !IN_RENAME_OBJECT
111543	){
111544	sqlite3ExprDeferredDelete(pParse, pLeft);
111545	sqlite3ExprDeferredDelete(pParse, pRight);
111546	return sqlite3Expr(db, TK_INTEGER, "0");
	@@ -112764,10 +113016,90 @@
112764	pExpr = pExpr->op==TK_AND ? pLeft : pRight;
112765	}
112766	}
112767	return pExpr;
112768	}
















































































112769
112770	/*
112771	** pExpr is a TK_FUNCTION node. Try to determine whether or not the
112772	** function is a constant function. A function is constant if all of
112773	** the following are true:
	@@ -114022,15 +114354,16 @@
114022	pCopy = sqlite3SelectDup(pParse->db, pSelect, 0);
114023	rc = pParse->db->mallocFailed ? 1 :sqlite3Select(pParse, pCopy, &dest);
114024	sqlite3SelectDelete(pParse->db, pCopy);
114025	sqlite3DbFree(pParse->db, dest.zAffSdst);
114026	if( addrBloom ){


114027	sqlite3VdbeGetOp(v, addrOnce)->p3 = dest.iSDParm2;
114028	if( dest.iSDParm2==0 ){
114029	sqlite3VdbeChangeToNoop(v, addrBloom);
114030	}else{
114031	sqlite3VdbeGetOp(v, addrOnce)->p3 = dest.iSDParm2;
114032	}
114033	}
114034	if( rc ){
114035	sqlite3KeyInfoUnref(pKeyInfo);
114036	return;
	@@ -114208,21 +114541,27 @@
114208	dest.eDest = SRT_Exists;
114209	sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iSDParm);
114210	VdbeComment((v, "Init EXISTS result"));
114211	}
114212	if( pSel->pLimit ){
114213	/* The subquery already has a limit. If the pre-existing limit is X
114214	** then make the new limit X<>0 so that the new limit is either 1 or 0 */
114215	sqlite3 *db = pParse->db;
114216	pLimit = sqlite3Expr(db, TK_INTEGER, "0");
114217	if( pLimit ){
114218	pLimit->affExpr = SQLITE_AFF_NUMERIC;
114219	pLimit = sqlite3PExpr(pParse, TK_NE,
114220	sqlite3ExprDup(db, pSel->pLimit->pLeft, 0), pLimit);
114221	}
114222	sqlite3ExprDeferredDelete(pParse, pSel->pLimit->pLeft);
114223	pSel->pLimit->pLeft = pLimit;






114224	}else{
114225	/* If there is no pre-existing limit add a limit of 1 */
114226	pLimit = sqlite3Expr(pParse->db, TK_INTEGER, "1");
114227	pSel->pLimit = sqlite3PExpr(pParse, TK_LIMIT, pLimit, 0);
114228	}
	@@ -114473,11 +114812,11 @@
114473	if( destIfFalse==destIfNull ){
114474	/* Combine Step 3 and Step 5 into a single opcode */
114475	if( ExprHasProperty(pExpr, EP_Subrtn) ){
114476	const VdbeOp *pOp = sqlite3VdbeGetOp(v, pExpr->y.sub.iAddr);
114477	assert( pOp->opcode==OP_Once \|\| pParse->nErr );
114478	if( pOp->opcode==OP_Once && pOp->p3>0 ){
114479	assert( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) );
114480	sqlite3VdbeAddOp4Int(v, OP_Filter, pOp->p3, destIfFalse,
114481	rLhs, nVector); VdbeCoverage(v);
114482	}
114483	}
	@@ -114660,11 +114999,16 @@
114660	iAddr = sqlite3VdbeAddOp3(v, OP_IfNullRow, pParse->iSelfTab-1, 0, regOut);
114661	}else{
114662	iAddr = 0;
114663	}
114664	sqlite3ExprCodeCopy(pParse, sqlite3ColumnExpr(pTab,pCol), regOut);
114665	if( pCol->affinity>=SQLITE_AFF_TEXT ){





114666	sqlite3VdbeAddOp4(v, OP_Affinity, regOut, 1, 0, &pCol->affinity, 1);
114667	}
114668	if( iAddr ) sqlite3VdbeJumpHere(v, iAddr);
114669	if( pParse->nErr>nErr ) pParse->db->errByteOffset = -1;
114670	}
	@@ -115347,15 +115691,21 @@
115347	case TK_GT:
115348	case TK_GE:
115349	case TK_NE:
115350	case TK_EQ: {
115351	Expr *pLeft = pExpr->pLeft;

115352	if( sqlite3ExprIsVector(pLeft) ){
115353	codeVectorCompare(pParse, pExpr, target, op, p5);
115354	}else{
115355	r1 = sqlite3ExprCodeTemp(pParse, pLeft, &regFree1);
115356	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);





115357	sqlite3VdbeAddOp2(v, OP_Integer, 1, inReg);
115358	codeCompare(pParse, pLeft, pExpr->pRight, op, r1, r2,
115359	sqlite3VdbeCurrentAddr(v)+2, p5,
115360	ExprHasProperty(pExpr,EP_Commuted));
115361	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
	@@ -115366,13 +115716,19 @@
115366	assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
115367	if( p5==SQLITE_NULLEQ ){
115368	sqlite3VdbeAddOp2(v, OP_Integer, 0, inReg);
115369	}else{
115370	sqlite3VdbeAddOp3(v, OP_ZeroOrNull, r1, inReg, r2);





115371	}
115372	testcase( regFree1==0 );
115373	testcase( regFree2==0 );

115374	}
115375	break;
115376	}
115377	case TK_AND:
115378	case TK_OR:
	@@ -115384,10 +115740,11 @@
115384	case TK_BITOR:
115385	case TK_SLASH:
115386	case TK_LSHIFT:
115387	case TK_RSHIFT:
115388	case TK_CONCAT: {

115389	assert( TK_AND==OP_And ); testcase( op==TK_AND );
115390	assert( TK_OR==OP_Or ); testcase( op==TK_OR );
115391	assert( TK_PLUS==OP_Add ); testcase( op==TK_PLUS );
115392	assert( TK_MINUS==OP_Subtract ); testcase( op==TK_MINUS );
115393	assert( TK_REM==OP_Remainder ); testcase( op==TK_REM );
	@@ -115395,15 +115752,27 @@
115395	assert( TK_BITOR==OP_BitOr ); testcase( op==TK_BITOR );
115396	assert( TK_SLASH==OP_Divide ); testcase( op==TK_SLASH );
115397	assert( TK_LSHIFT==OP_ShiftLeft ); testcase( op==TK_LSHIFT );
115398	assert( TK_RSHIFT==OP_ShiftRight ); testcase( op==TK_RSHIFT );
115399	assert( TK_CONCAT==OP_Concat ); testcase( op==TK_CONCAT );
115400	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
115401	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);






115402	sqlite3VdbeAddOp3(v, op, r2, r1, target);
115403	testcase( regFree1==0 );
115404	testcase( regFree2==0 );






115405	break;
115406	}
115407	case TK_UMINUS: {
115408	Expr *pLeft = pExpr->pLeft;
115409	assert( pLeft );
	@@ -116248,21 +116617,31 @@
116248	case TK_AND:
116249	case TK_OR: {
116250	Expr *pAlt = sqlite3ExprSimplifiedAndOr(pExpr);
116251	if( pAlt!=pExpr ){
116252	sqlite3ExprIfTrue(pParse, pAlt, dest, jumpIfNull);
116253	}else if( op==TK_AND ){
116254	int d2 = sqlite3VdbeMakeLabel(pParse);
116255	testcase( jumpIfNull==0 );
116256	sqlite3ExprIfFalse(pParse, pExpr->pLeft, d2,
116257	jumpIfNull^SQLITE_JUMPIFNULL);
116258	sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
116259	sqlite3VdbeResolveLabel(v, d2);
116260	}else{
116261	testcase( jumpIfNull==0 );
116262	sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
116263	sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);

















116264	}
116265	break;
116266	}
116267	case TK_NOT: {
116268	testcase( jumpIfNull==0 );
	@@ -116297,14 +116676,20 @@
116297	case TK_LE:
116298	case TK_GT:
116299	case TK_GE:
116300	case TK_NE:
116301	case TK_EQ: {

116302	if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
116303	testcase( jumpIfNull==0 );
116304	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116305	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);





116306	codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
116307	r1, r2, dest, jumpIfNull, ExprHasProperty(pExpr,EP_Commuted));
116308	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
116309	assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
116310	assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
	@@ -116315,22 +116700,29 @@
116315	assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
116316	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
116317	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
116318	testcase( regFree1==0 );
116319	testcase( regFree2==0 );







116320	break;
116321	}
116322	case TK_ISNULL:
116323	case TK_NOTNULL: {
116324	assert( TK_ISNULL==OP_IsNull ); testcase( op==TK_ISNULL );
116325	assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
116326	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116327	sqlite3VdbeTypeofColumn(v, r1);

116328	sqlite3VdbeAddOp2(v, op, r1, dest);
116329	VdbeCoverageIf(v, op==TK_ISNULL);
116330	VdbeCoverageIf(v, op==TK_NOTNULL);
116331	testcase( regFree1==0 );
116332	break;
116333	}
116334	case TK_BETWEEN: {
116335	testcase( jumpIfNull==0 );
116336	exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfTrue, jumpIfNull);
	@@ -116422,21 +116814,31 @@
116422	case TK_AND:
116423	case TK_OR: {
116424	Expr *pAlt = sqlite3ExprSimplifiedAndOr(pExpr);
116425	if( pAlt!=pExpr ){
116426	sqlite3ExprIfFalse(pParse, pAlt, dest, jumpIfNull);
116427	}else if( pExpr->op==TK_AND ){
116428	testcase( jumpIfNull==0 );
116429	sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
116430	sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
116431	}else{
116432	int d2 = sqlite3VdbeMakeLabel(pParse);
116433	testcase( jumpIfNull==0 );
116434	sqlite3ExprIfTrue(pParse, pExpr->pLeft, d2,
116435	jumpIfNull^SQLITE_JUMPIFNULL);
116436	sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
116437	sqlite3VdbeResolveLabel(v, d2);














116438	}
116439	break;
116440	}
116441	case TK_NOT: {
116442	testcase( jumpIfNull==0 );
	@@ -116474,14 +116876,20 @@
116474	case TK_LE:
116475	case TK_GT:
116476	case TK_GE:
116477	case TK_NE:
116478	case TK_EQ: {

116479	if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
116480	testcase( jumpIfNull==0 );
116481	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116482	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);





116483	codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
116484	r1, r2, dest, jumpIfNull,ExprHasProperty(pExpr,EP_Commuted));
116485	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
116486	assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
116487	assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
	@@ -116492,20 +116900,27 @@
116492	assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
116493	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
116494	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
116495	testcase( regFree1==0 );
116496	testcase( regFree2==0 );







116497	break;
116498	}
116499	case TK_ISNULL:
116500	case TK_NOTNULL: {
116501	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116502	sqlite3VdbeTypeofColumn(v, r1);

116503	sqlite3VdbeAddOp2(v, op, r1, dest);
116504	testcase( op==TK_ISNULL ); VdbeCoverageIf(v, op==TK_ISNULL);
116505	testcase( op==TK_NOTNULL ); VdbeCoverageIf(v, op==TK_NOTNULL);
116506	testcase( regFree1==0 );
116507	break;
116508	}
116509	case TK_BETWEEN: {
116510	testcase( jumpIfNull==0 );
116511	exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfFalse, jumpIfNull);
	@@ -117401,11 +117816,13 @@
117401	AggInfo pAggInfo, / The AggInfo object to search and/or modify */
117402	Expr pExpr / Expr describing the column to find or insert */
117403	){
117404	struct AggInfo_col *pCol;
117405	int k;

117406

117407	assert( pAggInfo->iFirstReg==0 );
117408	pCol = pAggInfo->aCol;
117409	for(k=0; k<pAggInfo->nColumn; k++, pCol++){
117410	if( pCol->pCExpr==pExpr ) return;
117411	if( pCol->iTable==pExpr->iTable
	@@ -117418,10 +117835,14 @@
117418	k = addAggInfoColumn(pParse->db, pAggInfo);
117419	if( k<0 ){
117420	/* OOM on resize */
117421	assert( pParse->db->mallocFailed );
117422	return;




117423	}
117424	pCol = &pAggInfo->aCol[k];
117425	assert( ExprUseYTab(pExpr) );
117426	pCol->pTab = pExpr->y.pTab;
117427	pCol->iTable = pExpr->iTable;
	@@ -117452,10 +117873,11 @@
117452	assert( pExpr->pAggInfo==0 \|\| pExpr->pAggInfo==pAggInfo );
117453	pExpr->pAggInfo = pAggInfo;
117454	if( pExpr->op==TK_COLUMN ){
117455	pExpr->op = TK_AGG_COLUMN;
117456	}

117457	pExpr->iAgg = (i16)k;
117458	}
117459
117460	/*
117461	** This is the xExprCallback for a tree walker. It is used to
	@@ -117536,17 +117958,23 @@
117536	){
117537	/* Check to see if pExpr is a duplicate of another aggregate
117538	** function that is already in the pAggInfo structure
117539	*/
117540	struct AggInfo_func *pItem = pAggInfo->aFunc;


117541	for(i=0; i<pAggInfo->nFunc; i++, pItem++){
117542	if( NEVER(pItem->pFExpr==pExpr) ) break;
117543	if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
117544	break;
117545	}
117546	}
117547	if( i>=pAggInfo->nFunc ){




117548	/* pExpr is original. Make a new entry in pAggInfo->aFunc[]
117549	*/
117550	u8 enc = ENC(pParse->db);
117551	i = addAggInfoFunc(pParse->db, pAggInfo);
117552	if( i>=0 ){
	@@ -117596,10 +118024,11 @@
117596	}
117597	/* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
117598	*/
117599	assert( !ExprHasProperty(pExpr, EP_TokenOnly\|EP_Reduced) );
117600	ExprSetVVAProperty(pExpr, EP_NoReduce);

117601	pExpr->iAgg = (i16)i;
117602	pExpr->pAggInfo = pAggInfo;
117603	return WRC_Prune;
117604	}else{
117605	return WRC_Continue;
	@@ -118998,14 +119427,14 @@
118998	}else{
118999	nQuot = sqlite3Strlen30(zQuot)-1;
119000	}
119001
119002	assert( nQuot>=nNew && nSql>=0 && nNew>=0 );
119003	zOut = sqlite3DbMallocZero(db, (u64)(nSql + pRename->nList*nQuot + 1));
119004	}else{
119005	assert( nSql>0 );
119006	zOut = (char)sqlite3DbMallocZero(db, (u64)(nSql2+1) * 3);
119007	if( zOut ){
119008	zBuf1 = &zOut[nSql*2+1];
119009	zBuf2 = &zOut[nSql*4+2];
119010	}
119011	}
	@@ -121683,20 +122112,10 @@
121683	}
121684	#endif
121685	while( z[0]!=0 && z[0]!=' ' ) z++;
121686	while( z[0]==' ' ) z++;
121687	}
121688
121689	/* Set the bLowQual flag if the peak number of rows obtained
121690	** from a full equality match is so large that a full table scan
121691	** seems likely to be faster than using the index.
121692	*/
121693	if( aLog[0] > 66 /* Index has more than 100 rows */
121694	&& aLog[0] <= aLog[nOut-1] /* And only a single value seen */
121695	){
121696	pIndex->bLowQual = 1;
121697	}
121698	}
121699	}
121700
121701	/*
121702	** This callback is invoked once for each index when reading the
	@@ -124091,11 +124510,11 @@
124091	*/
124092	SQLITE_PRIVATE int sqlite3TableColumnToIndex(Index *pIdx, int iCol){
124093	int i;
124094	i16 iCol16;
124095	assert( iCol>=(-1) && iCol<=SQLITE_MAX_COLUMN );
124096	assert( pIdx->nColumn<=SQLITE_MAX_COLUMN );
124097	iCol16 = iCol;
124098	for(i=0; i<pIdx->nColumn; i++){
124099	if( iCol16==pIdx->aiColumn[i] ){
124100	return i;
124101	}
	@@ -127239,11 +127658,10 @@
127239	}else{
127240	j = pCExpr->iColumn;
127241	assert( j<=0x7fff );
127242	if( j<0 ){
127243	j = pTab->iPKey;
127244	pIndex->bIdxRowid = 1;
127245	}else{
127246	if( pTab->aCol[j].notNull==0 ){
127247	pIndex->uniqNotNull = 0;
127248	}
127249	if( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ){
	@@ -128158,20 +128576,26 @@
128158	** Append the contents of SrcList p2 to SrcList p1 and return the resulting
128159	** SrcList. Or, if an error occurs, return NULL. In all cases, p1 and p2
128160	** are deleted by this function.
128161	*/
128162	SQLITE_PRIVATE SrcList sqlite3SrcListAppendList(Parse pParse, SrcList p1, SrcList p2){
128163	assert( p1 && p1->nSrc==1 );



128164	if( p2 ){
128165	SrcList *pNew = sqlite3SrcListEnlarge(pParse, p1, p2->nSrc, 1);

128166	if( pNew==0 ){
128167	sqlite3SrcListDelete(pParse->db, p2);
128168	}else{
128169	p1 = pNew;
128170	memcpy(&p1->a[1], p2->a, p2->nSrc*sizeof(SrcItem));



128171	sqlite3DbFree(pParse->db, p2);
128172	p1->a[0].fg.jointype \|= (JT_LTORJ & p1->a[1].fg.jointype);
128173	}
128174	}
128175	return p1;
128176	}
128177
	@@ -132064,11 +132488,11 @@
132064	int argc,
132065	sqlite3_value **argv,
132066	int nSep,
132067	const char *zSep
132068	){
132069	i64 j, k, n = 0;
132070	int i;
132071	char *z;
132072	for(i=0; i<argc; i++){
132073	n += sqlite3_value_bytes(argv[i]);
132074	}
	@@ -132078,12 +132502,12 @@
132078	sqlite3_result_error_nomem(context);
132079	return;
132080	}
132081	j = 0;
132082	for(i=0; i<argc; i++){
132083	k = sqlite3_value_bytes(argv[i]);
132084	if( k>0 ){
132085	const char v = (const char)sqlite3_value_text(argv[i]);
132086	if( v!=0 ){
132087	if( j>0 && nSep>0 ){
132088	memcpy(&z[j], zSep, nSep);
132089	j += nSep;
	@@ -135017,16 +135441,19 @@
135017	if( iReg==0 ){
135018	/* Move the previous opcode (which should be OP_MakeRecord) forward
135019	** by one slot and insert a new OP_TypeCheck where the current
135020	** OP_MakeRecord is found */
135021	VdbeOp *pPrev;

135022	sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
135023	pPrev = sqlite3VdbeGetLastOp(v);
135024	assert( pPrev!=0 );
135025	assert( pPrev->opcode==OP_MakeRecord \|\| sqlite3VdbeDb(v)->mallocFailed );
135026	pPrev->opcode = OP_TypeCheck;
135027	sqlite3VdbeAddOp3(v, OP_MakeRecord, pPrev->p1, pPrev->p2, pPrev->p3);


135028	}else{
135029	/* Insert an isolated OP_Typecheck */
135030	sqlite3VdbeAddOp2(v, OP_TypeCheck, iReg, pTab->nNVCol);
135031	sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
135032	}
	@@ -138755,10 +139182,12 @@
138755	/* Version 3.43.0 and later */
138756	int (stmt_explain)(sqlite3_stmt,int);
138757	/* Version 3.44.0 and later */
138758	void (get_clientdata)(sqlite3,const char);
138759	int (set_clientdata)(sqlite3, const char, void, void()(void));


138760	};
138761
138762	/*
138763	** This is the function signature used for all extension entry points. It
138764	** is also defined in the file "loadext.c".
	@@ -139088,10 +139517,12 @@
139088	/* Version 3.43.0 and later */
139089	#define sqlite3_stmt_explain sqlite3_api->stmt_explain
139090	/* Version 3.44.0 and later */
139091	#define sqlite3_get_clientdata sqlite3_api->get_clientdata
139092	#define sqlite3_set_clientdata sqlite3_api->set_clientdata


139093	#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
139094
139095	#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
139096	/* This case when the file really is being compiled as a loadable
139097	** extension */
	@@ -139609,11 +140040,13 @@
139609	sqlite3_is_interrupted,
139610	/* Version 3.43.0 and later */
139611	sqlite3_stmt_explain,
139612	/* Version 3.44.0 and later */
139613	sqlite3_get_clientdata,
139614	sqlite3_set_clientdata


139615	};
139616
139617	/* True if x is the directory separator character
139618	*/
139619	#if SQLITE_OS_WIN
	@@ -145235,11 +145668,11 @@
145235	SrcList pSrc, / Array of tables to search */
145236	int iStart, /* First member of pSrc->a[] to check */
145237	int iEnd, /* Last member of pSrc->a[] to check */
145238	const char zCol, / Name of the column we are looking for */
145239	int piTab, / Write index of pSrc->a[] here */
145240	int piCol, / Write index of pSrc->a[piTab].pTab->aCol[] here /
145241	int bIgnoreHidden /* Ignore hidden columns */
145242	){
145243	int i; /* For looping over tables in pSrc */
145244	int iCol; /* Index of column matching zCol */
145245
	@@ -145447,11 +145880,11 @@
145447	"not present in both tables", zName);
145448	return 1;
145449	}
145450	pE1 = sqlite3CreateColumnExpr(db, pSrc, iLeft, iLeftCol);
145451	sqlite3SrcItemColumnUsed(&pSrc->a[iLeft], iLeftCol);
145452	if( (pSrc->a[0].fg.jointype & JT_LTORJ)!=0 ){
145453	/* This branch runs if the query contains one or more RIGHT or FULL
145454	** JOINs. If only a single table on the left side of this join
145455	** contains the zName column, then this branch is a no-op.
145456	** But if there are two or more tables on the left side
145457	** of the join, construct a coalesce() function that gathers all
	@@ -145463,10 +145896,12 @@
145463	** JOIN. But older versions of SQLite do not do that, so we avoid
145464	** adding a new error so as to not break legacy applications.
145465	*/
145466	ExprList pFuncArgs = 0; / Arguments to the coalesce() */
145467	static const Token tkCoalesce = { "coalesce", 8 };


145468	while( tableAndColumnIndex(pSrc, iLeft+1, i, zName, &iLeft, &iLeftCol,
145469	pRight->fg.isSynthUsing)!=0 ){
145470	if( pSrc->a[iLeft].fg.isUsing==0
145471	\|\| sqlite3IdListIndex(pSrc->a[iLeft].u3.pUsing, zName)<0
145472	){
	@@ -145479,11 +145914,17 @@
145479	sqlite3SrcItemColumnUsed(&pSrc->a[iLeft], iLeftCol);
145480	}
145481	if( pFuncArgs ){
145482	pFuncArgs = sqlite3ExprListAppend(pParse, pFuncArgs, pE1);
145483	pE1 = sqlite3ExprFunction(pParse, pFuncArgs, &tkCoalesce, 0);



145484	}



145485	}
145486	pE2 = sqlite3CreateColumnExpr(db, pSrc, i+1, iRightCol);
145487	sqlite3SrcItemColumnUsed(pRight, iRightCol);
145488	pEq = sqlite3PExpr(pParse, TK_EQ, pE1, pE2);
145489	assert( pE2!=0 \|\| pEq==0 );
	@@ -146956,10 +147397,14 @@
146956	#else
146957	zType = columnType(&sNC, p, 0, 0, 0);
146958	#endif
146959	sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
146960	}




146961	#endif /* !defined(SQLITE_OMIT_DECLTYPE) */
146962	}
146963
146964
146965	/*
	@@ -147875,11 +148320,13 @@
147875	int unionTab; /* Cursor number of the temp table holding result */
147876	u8 op = 0; /* One of the SRT_ operations to apply to self */
147877	int priorOp; /* The SRT_ operation to apply to prior selects */
147878	Expr pLimit; / Saved values of p->nLimit */
147879	int addr;

147880	SelectDest uniondest;

147881
147882	testcase( p->op==TK_EXCEPT );
147883	testcase( p->op==TK_UNION );
147884	priorOp = SRT_Union;
147885	if( dest.eDest==priorOp ){
	@@ -147914,10 +148361,12 @@
147914
147915	/* Code the current SELECT statement
147916	*/
147917	if( p->op==TK_EXCEPT ){
147918	op = SRT_Except;


147919	}else{
147920	assert( p->op==TK_UNION );
147921	op = SRT_Union;
147922	}
147923	p->pPrior = 0;
	@@ -147934,10 +148383,11 @@
147934	p->pPrior = pPrior;
147935	p->pOrderBy = 0;
147936	if( p->op==TK_UNION ){
147937	p->nSelectRow = sqlite3LogEstAdd(p->nSelectRow, pPrior->nSelectRow);
147938	}

147939	sqlite3ExprDelete(db, p->pLimit);
147940	p->pLimit = pLimit;
147941	p->iLimit = 0;
147942	p->iOffset = 0;
147943
	@@ -147964,13 +148414,14 @@
147964	}
147965	default: assert( p->op==TK_INTERSECT ); {
147966	int tab1, tab2;
147967	int iCont, iBreak, iStart;
147968	Expr *pLimit;
147969	int addr;
147970	SelectDest intersectdest;
147971	int r1;

147972
147973	/* INTERSECT is different from the others since it requires
147974	** two temporary tables. Hence it has its own case. Begin
147975	** by allocating the tables we will need.
147976	*/
	@@ -147991,18 +148442,32 @@
147991	rc = sqlite3Select(pParse, pPrior, &intersectdest);
147992	if( rc ){
147993	goto multi_select_end;
147994	}
147995






147996	/* Code the current SELECT into temporary table "tab2"
147997	*/
147998	addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, tab2, 0);
147999	assert( p->addrOpenEphm[1] == -1 );
148000	p->addrOpenEphm[1] = addr;
148001	p->pPrior = 0;


148002	pLimit = p->pLimit;



148003	p->pLimit = 0;



148004	intersectdest.iSDParm = tab2;
148005	ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
148006	sqlite3SelectOpName(p->op)));
148007	TREETRACE(0x400, pParse, p, ("multiSelect INTERSECT right...\n"));
148008	rc = sqlite3Select(pParse, p, &intersectdest);
	@@ -148011,32 +148476,35 @@
148011	p->pPrior = pPrior;
148012	if( p->nSelectRow>pPrior->nSelectRow ){
148013	p->nSelectRow = pPrior->nSelectRow;
148014	}
148015	sqlite3ExprDelete(db, p->pLimit);


148016	p->pLimit = pLimit;


148017
148018	/* Generate code to take the intersection of the two temporary
148019	** tables.
148020	*/
148021	if( rc ) break;
148022	assert( p->pEList );
148023	iBreak = sqlite3VdbeMakeLabel(pParse);
148024	iCont = sqlite3VdbeMakeLabel(pParse);
148025	computeLimitRegisters(pParse, p, iBreak);
148026	sqlite3VdbeAddOp2(v, OP_Rewind, tab1, iBreak); VdbeCoverage(v);
148027	r1 = sqlite3GetTempReg(pParse);
148028	iStart = sqlite3VdbeAddOp2(v, OP_RowData, tab1, r1);

148029	sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0);
148030	VdbeCoverage(v);
148031	sqlite3ReleaseTempReg(pParse, r1);
148032	selectInnerLoop(pParse, p, tab1,
148033	0, 0, &dest, iCont, iBreak);
148034	sqlite3VdbeResolveLabel(v, iCont);
148035	sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart); VdbeCoverage(v);
148036	sqlite3VdbeResolveLabel(v, iBreak);
148037	sqlite3VdbeAddOp2(v, OP_Close, tab2, 0);

148038	sqlite3VdbeAddOp2(v, OP_Close, tab1, 0);
148039	break;
148040	}
148041	}
148042
	@@ -148711,10 +149179,11 @@
148711	typedef struct SubstContext {
148712	Parse pParse; / The parsing context */
148713	int iTable; /* Replace references to this table */
148714	int iNewTable; /* New table number */
148715	int isOuterJoin; /* Add TK_IF_NULL_ROW opcodes on each replacement */

148716	ExprList pEList; / Replacement expressions */
148717	ExprList pCList; / Collation sequences for replacement expr */
148718	} SubstContext;
148719
148720	/* Forward Declarations */
	@@ -148817,10 +149286,13 @@
148817	}
148818	}
148819	}else{
148820	if( pExpr->op==TK_IF_NULL_ROW && pExpr->iTable==pSubst->iTable ){
148821	pExpr->iTable = pSubst->iNewTable;



148822	}
148823	pExpr->pLeft = substExpr(pSubst, pExpr->pLeft);
148824	pExpr->pRight = substExpr(pSubst, pExpr->pRight);
148825	if( ExprUseXSelect(pExpr) ){
148826	substSelect(pSubst, pExpr->x.pSelect, 1);
	@@ -148855,10 +149327,11 @@
148855	){
148856	SrcList *pSrc;
148857	SrcItem *pItem;
148858	int i;
148859	if( !p ) return;

148860	do{
148861	substExprList(pSubst, p->pEList);
148862	substExprList(pSubst, p->pGroupBy);
148863	substExprList(pSubst, p->pOrderBy);
148864	p->pHaving = substExpr(pSubst, p->pHaving);
	@@ -148872,10 +149345,11 @@
148872	if( pItem->fg.isTabFunc ){
148873	substExprList(pSubst, pItem->u1.pFuncArg);
148874	}
148875	}
148876	}while( doPrior && (p = p->pPrior)!=0 );

148877	}
148878	#endif /* !defined(SQLITE_OMIT_SUBQUERY) \|\| !defined(SQLITE_OMIT_VIEW) */
148879
148880	#if !defined(SQLITE_OMIT_SUBQUERY) \|\| !defined(SQLITE_OMIT_VIEW)
148881	/*
	@@ -149087,13 +149561,13 @@
149087	** other than the one FROM-clause subquery that is a candidate
149088	** for flattening. (This is due to ticket [2f7170d73bf9abf80]
149089	** from 2015-02-09.)
149090	**
149091	** (3) If the subquery is the right operand of a LEFT JOIN then
149092	** (3a) the subquery may not be a join and
149093	** (3b) the FROM clause of the subquery may not contain a virtual
149094	** table and
149095	() Was: "The outer query may not have a GROUP BY." This case
149096	** is now managed correctly
149097	** (3d) the outer query may not be DISTINCT.
149098	** See also (26) for restrictions on RIGHT JOIN.
149099	**
	@@ -149305,11 +149779,11 @@
149305	**
149306	** See also tickets #306, #350, and #3300.
149307	*/
149308	if( (pSubitem->fg.jointype & (JT_OUTER\|JT_LTORJ))!=0 ){
149309	if( pSubSrc->nSrc>1 /* (3a) */
149310	\|\| IsVirtual(pSubSrc->a[0].pSTab) /* (3b) */
149311	\|\| (p->selFlags & SF_Distinct)!=0 /* (3d) */
149312	\|\| (pSubitem->fg.jointype & JT_RIGHT)!=0 /* (26) */
149313	){
149314	return 0;
149315	}
	@@ -149483,11 +149957,11 @@
149483	/* Defer deleting the Table object associated with the
149484	** subquery until code generation is
149485	** complete, since there may still exist Expr.pTab entries that
149486	** refer to the subquery even after flattening. Ticket #3346.
149487	**
149488	** pSubitem->pTab is always non-NULL by test restrictions and tests above.
149489	*/
149490	if( ALWAYS(pSubitem->pSTab!=0) ){
149491	Table *pTabToDel = pSubitem->pSTab;
149492	if( pTabToDel->nTabRef==1 ){
149493	Parse *pToplevel = sqlite3ParseToplevel(pParse);
	@@ -149613,10 +150087,11 @@
149613	SubstContext x;
149614	x.pParse = pParse;
149615	x.iTable = iParent;
149616	x.iNewTable = iNewParent;
149617	x.isOuterJoin = isOuterJoin;

149618	x.pEList = pSub->pEList;
149619	x.pCList = findLeftmostExprlist(pSub);
149620	substSelect(&x, pParent, 0);
149621	}
149622
	@@ -150198,10 +150673,11 @@
150198	unsetJoinExpr(pNew, -1, 1);
150199	x.pParse = pParse;
150200	x.iTable = pSrc->iCursor;
150201	x.iNewTable = pSrc->iCursor;
150202	x.isOuterJoin = 0;

150203	x.pEList = pSubq->pEList;
150204	x.pCList = findLeftmostExprlist(pSubq);
150205	pNew = substExpr(&x, pNew);
150206	#ifndef SQLITE_OMIT_WINDOWFUNC
150207	if( pSubq->pWin && 0==pushDownWindowCheck(pParse, pSubq, pNew) ){
	@@ -150595,11 +151071,11 @@
150595	** a WITH clause on the stack currently maintained by the parser (on the
150596	** pParse->pWith linked list). And if currently processing a CTE
150597	** CTE expression, through routine checks to see if the reference is
150598	** a recursive reference to the CTE.
150599	**
150600	** If pFrom matches a CTE according to either of these two above, pFrom->pTab
150601	** and other fields are populated accordingly.
150602	**
150603	** Return 0 if no match is found.
150604	** Return 1 if a match is found.
150605	** Return 2 if an error condition is detected.
	@@ -152221,10 +152697,87 @@
152221	pItem--;
152222	if( pItem->fg.isSubquery ) return 0; /* (1c-i) */
152223	}
152224	return 1;
152225	}













































































152226
152227	/*
152228	** Generate byte-code for the SELECT statement given in the p argument.
152229	**
152230	** The results are returned according to the SelectDest structure.
	@@ -152589,10 +153142,17 @@
152589	#endif
152590	if( p->pNext==0 ) ExplainQueryPlanPop(pParse);
152591	return rc;
152592	}
152593	#endif







152594
152595	/* Do the WHERE-clause constant propagation optimization if this is
152596	** a join. No need to spend time on this operation for non-join queries
152597	** as the equivalent optimization will be handled by query planner in
152598	** sqlite3WhereBegin(). tag-select-0330
	@@ -153349,10 +153909,14 @@
153349	}
153350
153351	if( iOrderByCol ){
153352	Expr *pX = p->pEList->a[iOrderByCol-1].pExpr;
153353	Expr *pBase = sqlite3ExprSkipCollateAndLikely(pX);




153354	if( ALWAYS(pBase!=0)
153355	&& pBase->op!=TK_AGG_COLUMN
153356	&& pBase->op!=TK_REGISTER
153357	){
153358	sqlite3ExprToRegister(pX, iAMem+j);
	@@ -153372,24 +153936,24 @@
153372	** over to a0,a1,a2. It then calls the output subroutine
153373	** and resets the aggregate accumulator registers in preparation
153374	** for the next GROUP BY batch.
153375	*/
153376	sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
153377	VdbeComment((v, "output one row"));
153378	sqlite3ExprCodeMove(pParse, iBMem, iAMem, pGroupBy->nExpr);
153379	sqlite3VdbeAddOp2(v, OP_IfPos, iAbortFlag, addrEnd); VdbeCoverage(v);
153380	VdbeComment((v, "check abort flag"));
153381	sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
153382	VdbeComment((v, "reset accumulator"));
153383
153384	/* Update the aggregate accumulators based on the content of
153385	** the current row
153386	*/
153387	sqlite3VdbeJumpHere(v, addr1);
153388	updateAccumulator(pParse, iUseFlag, pAggInfo, eDist);
153389	sqlite3VdbeAddOp2(v, OP_Integer, 1, iUseFlag);
153390	VdbeComment((v, "indicate data in accumulator"));
153391
153392	/* End of the loop
153393	*/
153394	if( groupBySort ){
153395	sqlite3VdbeAddOp2(v, OP_SorterNext, pAggInfo->sortingIdx,addrTopOfLoop);
	@@ -153402,11 +153966,11 @@
153402	sqlite3ExprListDelete(db, pDistinct);
153403
153404	/* Output the final row of result
153405	*/
153406	sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
153407	VdbeComment((v, "output final row"));
153408
153409	/* Jump over the subroutines
153410	*/
153411	sqlite3VdbeGoto(v, addrEnd);
153412
	@@ -153423,26 +153987,26 @@
153423	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153424	sqlite3VdbeResolveLabel(v, addrOutputRow);
153425	addrOutputRow = sqlite3VdbeCurrentAddr(v);
153426	sqlite3VdbeAddOp2(v, OP_IfPos, iUseFlag, addrOutputRow+2);
153427	VdbeCoverage(v);
153428	VdbeComment((v, "Groupby result generator entry point"));
153429	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153430	finalizeAggFunctions(pParse, pAggInfo);
153431	sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
153432	selectInnerLoop(pParse, p, -1, &sSort,
153433	&sDistinct, pDest,
153434	addrOutputRow+1, addrSetAbort);
153435	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153436	VdbeComment((v, "end groupby result generator"));
153437
153438	/* Generate a subroutine that will reset the group-by accumulator
153439	*/
153440	sqlite3VdbeResolveLabel(v, addrReset);
153441	resetAccumulator(pParse, pAggInfo);
153442	sqlite3VdbeAddOp2(v, OP_Integer, 0, iUseFlag);
153443	VdbeComment((v, "indicate accumulator empty"));
153444	sqlite3VdbeAddOp1(v, OP_Return, regReset);
153445
153446	if( distFlag!=0 && eDist!=WHERE_DISTINCT_NOOP ){
153447	struct AggInfo_func *pF = &pAggInfo->aFunc[0];
153448	fixDistinctOpenEph(pParse, eDist, pF->iDistinct, pF->iDistAddr);
	@@ -157326,11 +157890,12 @@
157326	saved_flags = db->flags;
157327	saved_mDbFlags = db->mDbFlags;
157328	saved_nChange = db->nChange;
157329	saved_nTotalChange = db->nTotalChange;
157330	saved_mTrace = db->mTrace;
157331	db->flags \|= SQLITE_WriteSchema \| SQLITE_IgnoreChecks \| SQLITE_Comments;

157332	db->mDbFlags \|= DBFLAG_PreferBuiltin \| DBFLAG_Vacuum;
157333	db->flags &= ~(u64)(SQLITE_ForeignKeys \| SQLITE_ReverseOrder
157334	\| SQLITE_Defensive \| SQLITE_CountRows);
157335	db->mTrace = 0;
157336
	@@ -159029,10 +159594,11 @@
159029	struct WhereLevel {
159030	int iLeftJoin; /* Memory cell used to implement LEFT OUTER JOIN */
159031	int iTabCur; /* The VDBE cursor used to access the table */
159032	int iIdxCur; /* The VDBE cursor used to access pIdx */
159033	int addrBrk; /* Jump here to break out of the loop */

159034	int addrNxt; /* Jump here to start the next IN combination */
159035	int addrSkip; /* Jump here for next iteration of skip-scan */
159036	int addrCont; /* Jump here to continue with the next loop cycle */
159037	int addrFirst; /* First instruction of interior of the loop */
159038	int addrBody; /* Beginning of the body of this loop */
	@@ -159234,10 +159800,13 @@
159234	u16 eOperator; /* A WO_xx value describing <op> */
159235	u8 nChild; /* Number of children that must disable us */
159236	u8 eMatchOp; /* Op for vtab MATCH/LIKE/GLOB/REGEXP terms */
159237	int iParent; /* Disable pWC->a[iParent] when this term disabled */
159238	int leftCursor; /* Cursor number of X in "X <op> <expr>" */



159239	union {
159240	struct {
159241	int leftColumn; /* Column number of X in "X <op> <expr>" */
159242	int iField; /* Field in (?,?,?) IN (SELECT...) vector */
159243	} x; /* Opcode other than OP_OR or OP_AND */
	@@ -159726,11 +160295,10 @@
159726	#if !defined(SQLITE_DEBUG)
159727	if( sqlite3ParseToplevel(pParse)->explain==2 \|\| IS_STMT_SCANSTATUS(pParse->db) )
159728	#endif
159729	{
159730	VdbeOp *pOp = sqlite3VdbeGetOp(pParse->pVdbe, addr);
159731
159732	SrcItem *pItem = &pTabList->a[pLevel->iFrom];
159733	sqlite3 db = pParse->db; / Database handle */
159734	int isSearch; /* True for a SEARCH. False for SCAN. */
159735	WhereLoop pLoop; / The controlling WhereLoop object */
159736	u32 flags; /* Flags that describe this loop */
	@@ -159749,11 +160317,14 @@
159749	\|\| ((flags&WHERE_VIRTUALTABLE)==0 && (pLoop->u.btree.nEq>0))
159750	\|\| (wctrlFlags&(WHERE_ORDERBY_MIN\|WHERE_ORDERBY_MAX));
159751
159752	sqlite3StrAccumInit(&str, db, zBuf, sizeof(zBuf), SQLITE_MAX_LENGTH);
159753	str.printfFlags = SQLITE_PRINTF_INTERNAL;
159754	sqlite3_str_appendf(&str, "%s %S", isSearch ? "SEARCH" : "SCAN", pItem);



159755	if( (flags & (WHERE_IPK\|WHERE_VIRTUALTABLE))==0 ){
159756	const char *zFmt = 0;
159757	Index *pIdx;
159758
159759	assert( pLoop->u.btree.pIndex!=0 );
	@@ -160198,11 +160769,13 @@
160198	for(i=iEq; i<pLoop->nLTerm; i++){
160199	if( pLoop->aLTerm[i]->pExpr==pX ){
160200	int iField;
160201	assert( (pLoop->aLTerm[i]->eOperator & (WO_OR\|WO_AND))==0 );
160202	iField = pLoop->aLTerm[i]->u.x.iField - 1;
160203	if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */


160204	pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
160205	pOrigRhs->a[iField].pExpr = 0;
160206	if( pRhs ) pRhs->a[pRhs->nExpr-1].u.x.iOrderByCol = iField+1;
160207	if( pOrigLhs ){
160208	assert( pOrigLhs->a[iField].pExpr!=0 );
	@@ -160295,35 +160868,26 @@
160295	if( pLoop->aLTerm[i] && pLoop->aLTerm[i]->pExpr==pX ){
160296	disableTerm(pLevel, pTerm);
160297	return;
160298	}
160299	}
160300	for(i=iEq;i<pLoop->nLTerm; i++){
160301	assert( pLoop->aLTerm[i]!=0 );
160302	if( pLoop->aLTerm[i]->pExpr==pX ) nEq++;
160303	}
160304
160305	iTab = 0;
160306	if( !ExprUseXSelect(pX) \|\| pX->x.pSelect->pEList->nExpr==1 ){
160307	eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, 0, &iTab);
160308	}else{
160309	Expr *pExpr = pTerm->pExpr;
160310	if( pExpr->iTable==0 \|\| !ExprHasProperty(pExpr, EP_Subrtn) ){
160311	sqlite3 *db = pParse->db;
160312	pX = removeUnindexableInClauseTerms(pParse, iEq, pLoop, pX);
160313	if( !db->mallocFailed ){
160314	aiMap = (int)sqlite3DbMallocZero(pParse->db, sizeof(int)nEq);
160315	eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, aiMap,&iTab);
160316	pExpr->iTable = iTab;
160317	}
160318	sqlite3ExprDelete(db, pX);
160319	}else{
160320	int n = sqlite3ExprVectorSize(pX->pLeft);
160321	aiMap = (int)sqlite3DbMallocZero(pParse->db, sizeof(int)MAX(nEq,n));
160322	eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, aiMap, &iTab);
160323	}
160324	pX = pExpr;
160325	}
160326
160327	if( eType==IN_INDEX_INDEX_DESC ){
160328	testcase( bRev );
160329	bRev = !bRev;
	@@ -160349,11 +160913,11 @@
160349	sizeof(pLevel->u.in.aInLoop[0])*pLevel->u.in.nIn);
160350	pIn = pLevel->u.in.aInLoop;
160351	if( pIn ){
160352	int iMap = 0; /* Index in aiMap[] */
160353	pIn += i;
160354	for(i=iEq;i<pLoop->nLTerm; i++){
160355	if( pLoop->aLTerm[i]->pExpr==pX ){
160356	int iOut = iTarget + i - iEq;
160357	if( eType==IN_INDEX_ROWID ){
160358	pIn->addrInTop = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iOut);
160359	}else{
	@@ -161000,19 +161564,20 @@
161000	WhereInfo pWInfo, / Complete information about the WHERE clause */
161001	int iLevel, /* Which level of pWInfo->a[] should be coded */
161002	int addrNxt, /* Jump here to bypass inner loops */
161003	Bitmask notReady /* Loops that are not ready */
161004	){

161005	while( ++iLevel < pWInfo->nLevel ){
161006	WhereLevel *pLevel = &pWInfo->a[iLevel];
161007	WhereLoop *pLoop = pLevel->pWLoop;
161008	if( pLevel->regFilter==0 ) continue;
161009	if( pLevel->pWLoop->nSkip ) continue;
161010	/* ,--- Because sqlite3ConstructBloomFilter() has will not have set
161011	** vvvvv--' pLevel->regFilter if this were true. */
161012	if( NEVER(pLoop->prereq & notReady) ) continue;
161013	assert( pLevel->addrBrk==0 );
161014	pLevel->addrBrk = addrNxt;
161015	if( pLoop->wsFlags & WHERE_IPK ){
161016	WhereTerm *pTerm = pLoop->aLTerm[0];
161017	int regRowid;
161018	assert( pTerm!=0 );
	@@ -161038,11 +161603,11 @@
161038	sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
161039	addrNxt, r1, nEq);
161040	VdbeCoverage(pParse->pVdbe);
161041	}
161042	pLevel->regFilter = 0;
161043	pLevel->addrBrk = 0;
161044	}
161045	}
161046
161047	/*
161048	** Loop pLoop is a WHERE_INDEXED level that uses at least one IN(...)
	@@ -161085,11 +161650,10 @@
161085	WhereClause pWC; / Decomposition of the entire WHERE clause */
161086	WhereTerm pTerm; / A WHERE clause term */
161087	sqlite3 db; / Database connection */
161088	SrcItem pTabItem; / FROM clause term being coded */
161089	int addrBrk; /* Jump here to break out of the loop */
161090	int addrHalt; /* addrBrk for the outermost loop */
161091	int addrCont; /* Jump here to continue with next cycle */
161092	int iRowidReg = 0; /* Rowid is stored in this register, if not zero */
161093	int iReleaseReg = 0; /* Temp register to free before returning */
161094	Index pIdx = 0; / Index used by loop (if any) */
161095	int iLoop; /* Iteration of constraint generator loop */
	@@ -161129,11 +161693,11 @@
161129	** When there is an IN operator, we also have a "addrNxt" label that
161130	** means to continue with the next IN value combination. When
161131	** there are no IN operators in the constraints, the "addrNxt" label
161132	** is the same as "addrBrk".
161133	*/
161134	addrBrk = pLevel->addrBrk = pLevel->addrNxt = sqlite3VdbeMakeLabel(pParse);
161135	addrCont = pLevel->addrCont = sqlite3VdbeMakeLabel(pParse);
161136
161137	/* If this is the right table of a LEFT OUTER JOIN, allocate and
161138	** initialize a memory cell that records if this table matches any
161139	** row of the left table of the join.
	@@ -161145,18 +161709,10 @@
161145	pLevel->iLeftJoin = ++pParse->nMem;
161146	sqlite3VdbeAddOp2(v, OP_Integer, 0, pLevel->iLeftJoin);
161147	VdbeComment((v, "init LEFT JOIN match flag"));
161148	}
161149
161150	/* Compute a safe address to jump to if we discover that the table for
161151	** this loop is empty and can never contribute content. */
161152	for(j=iLevel; j>0; j--){
161153	if( pWInfo->a[j].iLeftJoin ) break;
161154	if( pWInfo->a[j].pRJ ) break;
161155	}
161156	addrHalt = pWInfo->a[j].addrBrk;
161157
161158	/* Special case of a FROM clause subquery implemented as a co-routine */
161159	if( pTabItem->fg.viaCoroutine ){
161160	int regYield;
161161	Subquery *pSubq;
161162	assert( pTabItem->fg.isSubquery && pTabItem->u4.pSubq!=0 );
	@@ -161391,11 +161947,11 @@
161391	VdbeCoverageIf(v, pX->op==TK_LE);
161392	VdbeCoverageIf(v, pX->op==TK_LT);
161393	VdbeCoverageIf(v, pX->op==TK_GE);
161394	sqlite3ReleaseTempReg(pParse, rTemp);
161395	}else{
161396	sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, addrHalt);
161397	VdbeCoverageIf(v, bRev==0);
161398	VdbeCoverageIf(v, bRev!=0);
161399	}
161400	if( pEnd ){
161401	Expr *pX;
	@@ -161431,40 +161987,40 @@
161431	VdbeCoverageIf(v, testOp==OP_Ge);
161432	VdbeCoverageIf(v, testOp==OP_Gt);
161433	sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC \| SQLITE_JUMPIFNULL);
161434	}
161435	}else if( pLoop->wsFlags & WHERE_INDEXED ){
161436	/* Case 4: A scan using an index.
161437	**
161438	** The WHERE clause may contain zero or more equality
161439	** terms ("==" or "IN" operators) that refer to the N
161440	** left-most columns of the index. It may also contain
161441	** inequality constraints (>, <, >= or <=) on the indexed
161442	** column that immediately follows the N equalities. Only
161443	** the right-most column can be an inequality - the rest must
161444	** use the "==" and "IN" operators. For example, if the
161445	** index is on (x,y,z), then the following clauses are all
161446	** optimized:
161447	**
161448	** x=5
161449	** x=5 AND y=10
161450	** x=5 AND y<10
161451	** x=5 AND y>5 AND y<10
161452	** x=5 AND y=5 AND z<=10
161453	**
161454	** The z<10 term of the following cannot be used, only
161455	** the x=5 term:
161456	**
161457	** x=5 AND z<10
161458	**
161459	** N may be zero if there are inequality constraints.
161460	** If there are no inequality constraints, then N is at
161461	** least one.
161462	**
161463	** This case is also used when there are no WHERE clause
161464	** constraints but an index is selected anyway, in order
161465	** to force the output order to conform to an ORDER BY.
161466	*/
161467	static const u8 aStartOp[] = {
161468	0,
161469	0,
161470	OP_Rewind, /* 2: (!start_constraints && startEq && !bRev) */
	@@ -161801,16 +162357,17 @@
161801	}
161802
161803	if( pLevel->iLeftJoin==0 ){
161804	/* If a partial index is driving the loop, try to eliminate WHERE clause
161805	** terms from the query that must be true due to the WHERE clause of
161806	** the partial index.

161807	**
161808	** 2019-11-02 ticket 623eff57e76d45f6: This optimization does not work
161809	** for a LEFT JOIN.
161810	*/
161811	if( pIdx->pPartIdxWhere ){
161812	whereApplyPartialIndexConstraints(pIdx->pPartIdxWhere, iCur, pWC);
161813	}
161814	}else{
161815	testcase( pIdx->pPartIdxWhere );
161816	/* The following assert() is not a requirement, merely an observation:
	@@ -162185,11 +162742,11 @@
162185	pLevel->op = OP_Noop;
162186	}else{
162187	codeCursorHint(pTabItem, pWInfo, pLevel, 0);
162188	pLevel->op = aStep[bRev];
162189	pLevel->p1 = iCur;
162190	pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, aStart[bRev], iCur, addrHalt);
162191	VdbeCoverageIf(v, bRev==0);
162192	VdbeCoverageIf(v, bRev!=0);
162193	pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
162194	}
162195	}
	@@ -163479,34 +164036,46 @@
163479	** column references. This routine checks to see if pExpr is an equivalence
163480	** relation:
163481	** 1. The SQLITE_Transitive optimization must be enabled
163482	** 2. Must be either an == or an IS operator
163483	** 3. Not originating in the ON clause of an OUTER JOIN
163484	** 4. The affinities of A and B must be compatible
163485	** 5a. Both operands use the same collating sequence OR
163486	** 5b. The overall collating sequence is BINARY

163487	** If this routine returns TRUE, that means that the RHS can be substituted
163488	** for the LHS anyplace else in the WHERE clause where the LHS column occurs.
163489	** This is an optimization. No harm comes from returning 0. But if 1 is
163490	** returned when it should not be, then incorrect answers might result.
163491	*/
163492	static int termIsEquivalence(Parse pParse, Expr pExpr){
163493	char aff1, aff2;
163494	CollSeq *pColl;
163495	if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0;
163496	if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0;
163497	if( ExprHasProperty(pExpr, EP_OuterON) ) return 0;







163498	aff1 = sqlite3ExprAffinity(pExpr->pLeft);
163499	aff2 = sqlite3ExprAffinity(pExpr->pRight);
163500	if( aff1!=aff2
163501	&& (!sqlite3IsNumericAffinity(aff1) \|\| !sqlite3IsNumericAffinity(aff2))
163502	){
163503	return 0;
163504	}
163505	pColl = sqlite3ExprCompareCollSeq(pParse, pExpr);
163506	if( sqlite3IsBinary(pColl) ) return 1;
163507	return sqlite3ExprCollSeqMatch(pParse, pExpr->pLeft, pExpr->pRight);




163508	}
163509
163510	/*
163511	** Recursively walk the expressions of a SELECT statement and generate
163512	** a bitmask indicating which tables are used in that expression
	@@ -163660,10 +164229,13 @@
163660	if( db->mallocFailed ){
163661	return;
163662	}
163663	assert( pWC->nTerm > idxTerm );
163664	pTerm = &pWC->a[idxTerm];



163665	pMaskSet = &pWInfo->sMaskSet;
163666	pExpr = pTerm->pExpr;
163667	assert( pExpr!=0 ); /* Because malloc() has not failed */
163668	assert( pExpr->op!=TK_AS && pExpr->op!=TK_COLLATE );
163669	pMaskSet->bVarSelect = 0;
	@@ -163767,12 +164339,12 @@
163767	pNew = &pWC->a[idxNew];
163768	markTermAsChild(pWC, idxNew, idxTerm);
163769	if( op==TK_IS ) pNew->wtFlags \|= TERM_IS;
163770	pTerm = &pWC->a[idxTerm];
163771	pTerm->wtFlags \|= TERM_COPIED;
163772
163773	if( termIsEquivalence(pParse, pDup) ){
163774	pTerm->eOperator \|= WO_EQUIV;
163775	eExtraOp = WO_EQUIV;
163776	}
163777	}else{
163778	pDup = pExpr;
	@@ -164074,11 +164646,11 @@
164074	pNewExpr->w.iJoin = pExpr->w.iJoin;
164075	}
164076	idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL\|TERM_DYNAMIC);
164077	testcase( idxNew==0 );
164078	pNewTerm = &pWC->a[idxNew];
164079	pNewTerm->prereqRight = prereqExpr;
164080	pNewTerm->leftCursor = pLeft->iTable;
164081	pNewTerm->u.x.leftColumn = pLeft->iColumn;
164082	pNewTerm->eOperator = WO_AUX;
164083	pNewTerm->eMatchOp = eOp2;
164084	markTermAsChild(pWC, idxNew, idxTerm);
	@@ -164185,11 +164757,11 @@
164185	** SELECT statement passed as the second argument. These terms are only
164186	** added if:
164187	**
164188	** 1. The SELECT statement has a LIMIT clause, and
164189	** 2. The SELECT statement is not an aggregate or DISTINCT query, and
164190	** 3. The SELECT statement has exactly one object in its from clause, and
164191	** that object is a virtual table, and
164192	** 4. There are no terms in the WHERE clause that will not be passed
164193	** to the virtual table xBestIndex method.
164194	** 5. The ORDER BY clause, if any, will be made available to the xBestIndex
164195	** method.
	@@ -164222,12 +164794,26 @@
164222	** pWC->a[] array. So this term can be ignored, as a LIMIT clause
164223	** will only be added if each of the child terms passes the
164224	** (leftCursor==iCsr) test below. */
164225	continue;
164226	}
164227	if( pWC->a[ii].leftCursor!=iCsr ) return;
164228	if( pWC->a[ii].prereqRight!=0 ) return;














164229	}
164230
164231	/* Check condition (5). Return early if it is not met. */
164232	if( pOrderBy ){
164233	for(ii=0; ii<pOrderBy->nExpr; ii++){
	@@ -164887,15 +165473,15 @@
164887	continue;
164888	}
164889	pScan->pWC = pWC;
164890	pScan->k = k+1;
164891	#ifdef WHERETRACE_ENABLED
164892	if( sqlite3WhereTrace & 0x20000 ){
164893	int ii;
164894	sqlite3DebugPrintf("SCAN-TERM %p: nEquiv=%d",
164895	pTerm, pScan->nEquiv);
164896	for(ii=0; ii<pScan->nEquiv; ii++){
164897	sqlite3DebugPrintf(" {%d:%d}",
164898	pScan->aiCur[ii], pScan->aiColumn[ii]);
164899	}
164900	sqlite3DebugPrintf("\n");
164901	}
	@@ -165662,11 +166248,13 @@
165662	sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, pSubq->addrFillSub);
165663	addrTop = sqlite3VdbeAddOp1(v, OP_Yield, regYield);
165664	VdbeCoverage(v);
165665	VdbeComment((v, "next row of %s", pSrc->pSTab->zName));
165666	}else{
165667	addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, pLevel->iTabCur); VdbeCoverage(v);


165668	}
165669	if( pPartial ){
165670	iContinue = sqlite3VdbeMakeLabel(pParse);
165671	sqlite3ExprIfFalse(pParse, pPartial, iContinue, SQLITE_JUMPIFNULL);
165672	pLoop->wsFlags \|= WHERE_PARTIALIDX;
	@@ -165690,15 +166278,18 @@
165690	assert( pLevel->iIdxCur>0 );
165691	translateColumnToCopy(pParse, addrTop, pLevel->iTabCur,
165692	pSrc->u4.pSubq->regResult, pLevel->iIdxCur);
165693	sqlite3VdbeGoto(v, addrTop);
165694	pSrc->fg.viaCoroutine = 0;

165695	}else{
165696	sqlite3VdbeAddOp2(v, OP_Next, pLevel->iTabCur, addrTop+1); VdbeCoverage(v);
165697	sqlite3VdbeChangeP5(v, SQLITE_STMTSTATUS_AUTOINDEX);



165698	}
165699	sqlite3VdbeJumpHere(v, addrTop);
165700	sqlite3ReleaseTempReg(pParse, regRecord);
165701
165702	/* Jump here when skipping the initialization */
165703	sqlite3VdbeJumpHere(v, addrInit);
165704	sqlite3VdbeScanStatusRange(v, addrExp, addrExp, -1);
	@@ -166846,10 +167437,11 @@
166846	sqlite3_snprintf(sizeof(zLeft),zLeft,"indexable=0x%llx",
166847	pTerm->u.pOrInfo->indexable);
166848	}else{
166849	sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor);
166850	}

166851	sqlite3DebugPrintf(
166852	"TERM-%-3d %p %s %-12s op=%03x wtFlags=%04x",
166853	iTerm, pTerm, zType, zLeft, pTerm->eOperator, pTerm->wtFlags);
166854	/* The 0x10000 .wheretrace flag causes extra information to be
166855	** shown about each Term */
	@@ -167620,15 +168212,12 @@
167620	opMask = WO_LT\|WO_LE;
167621	}else{
167622	assert( pNew->u.btree.nBtm==0 );
167623	opMask = WO_EQ\|WO_IN\|WO_GT\|WO_GE\|WO_LT\|WO_LE\|WO_ISNULL\|WO_IS;
167624	}
167625	if( pProbe->bUnordered \|\| pProbe->bLowQual ){
167626	if( pProbe->bUnordered ) opMask &= ~(WO_GT\|WO_GE\|WO_LT\|WO_LE);
167627	if( pProbe->bLowQual && pSrc->fg.isIndexedBy==0 ){
167628	opMask &= ~(WO_EQ\|WO_IN\|WO_IS);
167629	}
167630	}
167631
167632	assert( pNew->u.btree.nEq<pProbe->nColumn );
167633	assert( pNew->u.btree.nEq<pProbe->nKeyCol
167634	\|\| pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY );
	@@ -167697,19 +168286,33 @@
167697	if( eOp & WO_IN ){
167698	Expr *pExpr = pTerm->pExpr;
167699	if( ExprUseXSelect(pExpr) ){
167700	/* "x IN (SELECT ...)": TUNING: the SELECT returns 25 rows */
167701	int i;

167702	nIn = 46; assert( 46==sqlite3LogEst(25) );
167703
167704	/* The expression may actually be of the form (x, y) IN (SELECT...).
167705	** In this case there is a separate term for each of (x) and (y).
167706	** However, the nIn multiplier should only be applied once, not once
167707	** for each such term. The following loop checks that pTerm is the
167708	** first such term in use, and sets nIn back to 0 if it is not. */
167709	for(i=0; i<pNew->nLTerm-1; i++){
167710	if( pNew->aLTerm[i] && pNew->aLTerm[i]->pExpr==pExpr ) nIn = 0;













167711	}
167712	}else if( ALWAYS(pExpr->x.pList && pExpr->x.pList->nExpr) ){
167713	/* "x IN (value, value, ...)" */
167714	nIn = sqlite3LogEst(pExpr->x.pList->nExpr);
167715	}
	@@ -167937,11 +168540,11 @@
167937	}
167938
167939	if( (pNew->wsFlags & WHERE_TOP_LIMIT)==0
167940	&& pNew->u.btree.nEq<pProbe->nColumn
167941	&& (pNew->u.btree.nEq<pProbe->nKeyCol \|\|
167942	(pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY && !pProbe->bIdxRowid))
167943	){
167944	if( pNew->u.btree.nEq>3 ){
167945	sqlite3ProgressCheck(pParse);
167946	}
167947	whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nInMul+nIn);
	@@ -167976,10 +168579,11 @@
167976	&& saved_nEq==pNew->nLTerm
167977	&& pProbe->noSkipScan==0
167978	&& pProbe->hasStat1!=0
167979	&& OptimizationEnabled(db, SQLITE_SkipScan)
167980	&& pProbe->aiRowLogEst[saved_nEq+1]>=42 /* TUNING: Minimum for skip-scan */

167981	&& (rc = whereLoopResize(db, pNew, pNew->nLTerm+1))==SQLITE_OK
167982	){
167983	LogEst nIter;
167984	pNew->u.btree.nEq++;
167985	pNew->nSkip++;
	@@ -168066,10 +168670,11 @@
168066	Expr *pExpr;
168067	pExpr = pTerm->pExpr;
168068	if( (!ExprHasProperty(pExpr, EP_OuterON) \|\| pExpr->w.iJoin==iTab)
168069	&& ((jointype & JT_OUTER)==0 \|\| ExprHasProperty(pExpr, EP_OuterON))
168070	&& sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, iTab)

168071	&& (pTerm->wtFlags & TERM_VNULL)==0
168072	){
168073	return 1;
168074	}
168075	}
	@@ -168561,11 +169166,11 @@
168561	}
168562	}else if( m==0
168563	&& (HasRowid(pTab) \|\| pWInfo->pSelect!=0 \|\| sqlite3FaultSim(700))
168564	){
168565	WHERETRACE(0x200,
168566	("-> %s a covering index according to bitmasks\n",
168567	pProbe->zName, m==0 ? "is" : "is not"));
168568	pNew->wsFlags = WHERE_IDX_ONLY \| WHERE_INDEXED;
168569	}
168570	}
168571
	@@ -171532,10 +172137,18 @@
171532
171533	pTabItem = &pTabList->a[pLevel->iFrom];
171534	pTab = pTabItem->pSTab;
171535	iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
171536	pLoop = pLevel->pWLoop;








171537	if( (pTab->tabFlags & TF_Ephemeral)!=0 \|\| IsView(pTab) ){
171538	/* Do nothing */
171539	}else
171540	#ifndef SQLITE_OMIT_VIRTUALTABLE
171541	if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 ){
	@@ -171583,10 +172196,17 @@
171583	}
171584	#ifdef SQLITE_ENABLE_COLUMN_USED_MASK
171585	sqlite3VdbeAddOp4Dup8(v, OP_ColumnsUsed, pTabItem->iCursor, 0, 0,
171586	(const u8*)&pTabItem->colUsed, P4_INT64);
171587	#endif







171588	}else{
171589	sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
171590	}
171591	if( pLoop->wsFlags & WHERE_INDEXED ){
171592	Index *pIx = pLoop->u.btree.pIndex;
	@@ -171839,10 +172459,13 @@
171839	VdbeCoverageIf(v, op==OP_SeekLT);
171840	VdbeCoverageIf(v, op==OP_SeekGT);
171841	sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2);
171842	}
171843	#endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */



171844	/* The common case: Advance to the next row */
171845	if( pLevel->addrCont ) sqlite3VdbeResolveLabel(v, pLevel->addrCont);
171846	sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
171847	sqlite3VdbeChangeP5(v, pLevel->p5);
171848	VdbeCoverage(v);
	@@ -179911,16 +180534,25 @@
179911	/* Expressions of the form
179912	**
179913	** expr1 IN ()
179914	** expr1 NOT IN ()
179915	**
179916	** simplify to constants 0 (false) and 1 (true), respectively,
179917	** regardless of the value of expr1.




179918	*/
179919	sqlite3ExprUnmapAndDelete(pParse, yymsp[-4].minor.yy590);
179920	yymsp[-4].minor.yy590 = sqlite3Expr(pParse->db, TK_STRING, yymsp[-3].minor.yy502 ? "true" : "false");
179921	if( yymsp[-4].minor.yy590 ) sqlite3ExprIdToTrueFalse(yymsp[-4].minor.yy590);





179922	}else{
179923	Expr *pRHS = yymsp[-1].minor.yy402->a[0].pExpr;
179924	if( yymsp[-1].minor.yy402->nExpr==1 && sqlite3ExprIsConstant(pParse,pRHS) && yymsp[-4].minor.yy590->op!=TK_VECTOR ){
179925	yymsp[-1].minor.yy402->a[0].pExpr = 0;
179926	sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy402);
	@@ -181522,11 +182154,11 @@
181522	static int getToken(const unsigned char **pz){
181523	const unsigned char z = pz;
181524	int t; /* Token type to return */
181525	do {
181526	z += sqlite3GetToken(z, &t);
181527	}while( t==TK_SPACE );
181528	if( t==TK_ID
181529	\|\| t==TK_STRING
181530	\|\| t==TK_JOIN_KW
181531	\|\| t==TK_WINDOW
181532	\|\| t==TK_OVER
	@@ -184472,10 +185104,11 @@
184472	#ifdef SQLITE_ENABLE_API_ARMOR
184473	if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
184474	#endif
184475	if( ms<-1 ) return SQLITE_RANGE;
184476	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT

184477	db->setlkTimeout = ms;
184478	db->setlkFlags = flags;
184479	sqlite3BtreeEnterAll(db);
184480	for(iDb=0; iDb<db->nDb; iDb++){
184481	Btree *pBt = db->aDb[iDb].pBt;
	@@ -184483,10 +185116,11 @@
184483	sqlite3_file *fd = sqlite3PagerFile(sqlite3BtreePager(pBt));
184484	sqlite3OsFileControlHint(fd, SQLITE_FCNTL_BLOCK_ON_CONNECT, (void*)&bBOC);
184485	}
184486	}
184487	sqlite3BtreeLeaveAll(db);

184488	#endif
184489	#if !defined(SQLITE_ENABLE_API_ARMOR) && !defined(SQLITE_ENABLE_SETLK_TIMEOUT)
184490	UNUSED_PARAMETER(db);
184491	UNUSED_PARAMETER(flags);
184492	#endif
	@@ -188869,11 +189503,11 @@
188869
188870	/*
188871	** Macros needed to provide flexible arrays in a portable way
188872	*/
188873	#ifndef offsetof
188874	# define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
188875	#endif
188876	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
188877	# define FLEXARRAY
188878	#else
188879	# define FLEXARRAY 1
	@@ -207968,60 +208602,113 @@
207968	** Growing our own isspace() routine this way is twice as fast as
207969	** the library isspace() function, resulting in a 7% overall performance
207970	** increase for the text-JSON parser. (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
207971	*/
207972	static const char jsonIsSpace[] = {
207973	0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0,
207974	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207975	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207976	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207977	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207978	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207979	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207980	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207981
207982	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207983	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207984	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207985	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207986	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207987	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207988	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
207989	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
























207990	};
207991	#define jsonIsspace(x) (jsonIsSpace[(unsigned char)x])
207992
207993	/*
207994	** The set of all space characters recognized by jsonIsspace().
207995	** Useful as the second argument to strspn().
207996	*/

207997	static const char jsonSpaces[] = "\011\012\015\040";





207998
207999	/*
208000	** Characters that are special to JSON. Control characters,
208001	** '"' and '\\' and '\''. Actually, '\'' is not special to
208002	** canonical JSON, but it is special in JSON-5, so we include
208003	** it in the set of special characters.
208004	*/
208005	static const char jsonIsOk[256] = {
208006	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
208007	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
208008	1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
208009	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208010	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208011	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
208012	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208013	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208014
208015	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208016	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208017	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208018	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208019	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208020	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208021	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
208022	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1























208023	};
208024
208025	/* Objects */
208026	typedef struct JsonCache JsonCache;
208027	typedef struct JsonString JsonString;
	@@ -208162,11 +208849,11 @@
208162
208163	/**************************************************************************
208164	** Forward references
208165	**************************************************************************/
208166	static void jsonReturnStringAsBlob(JsonString*);
208167	static int jsonFuncArgMightBeBinary(sqlite3_value *pJson);
208168	static u32 jsonTranslateBlobToText(const JsonParse,u32,JsonString);
208169	static void jsonReturnParse(sqlite3_context,JsonParse);
208170	static JsonParse jsonParseFuncArg(sqlite3_context,sqlite3_value*,u32);
208171	static void jsonParseFree(JsonParse*);
208172	static u32 jsonbPayloadSize(const JsonParse, u32, u32);
	@@ -208580,15 +209267,13 @@
208580	jsonAppendString(p, z, n);
208581	}
208582	break;
208583	}
208584	default: {
208585	if( jsonFuncArgMightBeBinary(pValue) ){
208586	JsonParse px;
208587	memset(&px, 0, sizeof(px));
208588	px.aBlob = (u8*)sqlite3_value_blob(pValue);
208589	px.nBlob = sqlite3_value_bytes(pValue);
208590	jsonTranslateBlobToText(&px, 0, p);
208591	}else if( p->eErr==0 ){
208592	sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1);
208593	p->eErr = JSTRING_ERR;
208594	jsonStringReset(p);
	@@ -209051,12 +209736,14 @@
209051	nExtra = 0;
209052	}else if( szType==12 ){
209053	nExtra = 1;
209054	}else if( szType==13 ){
209055	nExtra = 2;
209056	}else{
209057	nExtra = 4;


209058	}
209059	if( szPayload<=11 ){
209060	nNeeded = 0;
209061	}else if( szPayload<=0xff ){
209062	nNeeded = 1;
	@@ -209522,11 +210209,16 @@
209522	c = z[++j];
209523	if( c=='"' \|\| c=='\\' \|\| c=='/' \|\| c=='b' \|\| c=='f'
209524	\|\| c=='n' \|\| c=='r' \|\| c=='t'
209525	\|\| (c=='u' && jsonIs4Hex(&z[j+1])) ){
209526	if( opcode==JSONB_TEXT ) opcode = JSONB_TEXTJ;
209527	}else if( c=='\'' \|\| c=='0' \|\| c=='v' \|\| c=='\n'





209528	\|\| (0xe2==(u8)c && 0x80==(u8)z[j+1]
209529	&& (0xa8==(u8)z[j+2] \|\| 0xa9==(u8)z[j+2]))
209530	\|\| (c=='x' && jsonIs2Hex(&z[j+1])) ){
209531	opcode = JSONB_TEXT5;
209532	pParse->hasNonstd = 1;
	@@ -209909,11 +210601,11 @@
209909	\|\| pParse->aBlob[i+4]!=0
209910	){
209911	*pSz = 0;
209912	return 0;
209913	}
209914	sz = (pParse->aBlob[i+5]<<24) + (pParse->aBlob[i+6]<<16) +
209915	(pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8];
209916	n = 9;
209917	}
209918	if( (i64)i+sz+n > pParse->nBlob
209919	&& (i64)i+sz+n > pParse->nBlob-pParse->delta
	@@ -210258,37 +210950,10 @@
210258	}
210259	}
210260	return i;
210261	}
210262
210263
210264	/* Return true if the input pJson
210265	**
210266	** For performance reasons, this routine does not do a detailed check of the
210267	** input BLOB to ensure that it is well-formed. Hence, false positives are
210268	** possible. False negatives should never occur, however.
210269	*/
210270	static int jsonFuncArgMightBeBinary(sqlite3_value *pJson){
210271	u32 sz, n;
210272	const u8 *aBlob;
210273	int nBlob;
210274	JsonParse s;
210275	if( sqlite3_value_type(pJson)!=SQLITE_BLOB ) return 0;
210276	aBlob = sqlite3_value_blob(pJson);
210277	nBlob = sqlite3_value_bytes(pJson);
210278	if( nBlob<1 ) return 0;
210279	if( NEVER(aBlob==0) \|\| (aBlob[0] & 0x0f)>JSONB_OBJECT ) return 0;
210280	memset(&s, 0, sizeof(s));
210281	s.aBlob = (u8*)aBlob;
210282	s.nBlob = nBlob;
210283	n = jsonbPayloadSize(&s, 0, &sz);
210284	if( n==0 ) return 0;
210285	if( sz+n!=(u32)nBlob ) return 0;
210286	if( (aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0 ) return 0;
210287	return sz+n==(u32)nBlob;
210288	}
210289
210290	/*
210291	** Given that a JSONB_ARRAY object starts at offset i, return
210292	** the number of entries in that array.
210293	*/
210294	static u32 jsonbArrayCount(JsonParse *pParse, u32 iRoot){
	@@ -210517,11 +211182,25 @@
210517	case 'f': { *piOut = '\f'; return 2; }
210518	case 'n': { *piOut = '\n'; return 2; }
210519	case 'r': { *piOut = '\r'; return 2; }
210520	case 't': { *piOut = '\t'; return 2; }
210521	case 'v': { *piOut = '\v'; return 2; }
210522	case '0': { *piOut = 0; return 2; }














210523	case '\'':
210524	case '"':
210525	case '/':
210526	case '\\':{ *piOut = z[1]; return 2; }
210527	case 'x': {
	@@ -211112,14 +211791,11 @@
211112	pParse->aBlob = aNull;
211113	pParse->nBlob = 1;
211114	return 0;
211115	}
211116	case SQLITE_BLOB: {
211117	if( jsonFuncArgMightBeBinary(pArg) ){
211118	pParse->aBlob = (u8*)sqlite3_value_blob(pArg);
211119	pParse->nBlob = sqlite3_value_bytes(pArg);
211120	}else{
211121	sqlite3_result_error(ctx, "JSON cannot hold BLOB values", -1);
211122	return 1;
211123	}
211124	break;
211125	}
	@@ -211266,31 +211942,50 @@
211266	}
211267
211268	/*
211269	** If pArg is a blob that seems like a JSONB blob, then initialize
211270	** p to point to that JSONB and return TRUE. If pArg does not seem like
211271	** a JSONB blob, then return FALSE;
211272	**
211273	** This routine is only called if it is already known that pArg is a
211274	** blob. The only open question is whether or not the blob appears
211275	** to be a JSONB blob.



















211276	*/
211277	static int jsonArgIsJsonb(sqlite3_value pArg, JsonParse p){
211278	u32 n, sz = 0;


211279	p->aBlob = (u8*)sqlite3_value_blob(pArg);
211280	p->nBlob = (u32)sqlite3_value_bytes(pArg);
211281	if( p->nBlob==0 ){
211282	p->aBlob = 0;
211283	return 0;
211284	}
211285	if( NEVER(p->aBlob==0) ){
211286	return 0;
211287	}
211288	if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT
211289	&& (n = jsonbPayloadSize(p, 0, &sz))>0
211290	&& sz+n==p->nBlob
211291	&& ((p->aBlob[0] & 0x0f)>JSONB_FALSE \|\| sz==0)



211292	){
211293	return 1;
211294	}
211295	p->aBlob = 0;
211296	p->nBlob = 0;
	@@ -212379,25 +213074,21 @@
212379	sqlite3_result_int(ctx, 0);
212380	#endif
212381	return;
212382	}
212383	case SQLITE_BLOB: {
212384	if( jsonFuncArgMightBeBinary(argv[0]) ){


212385	if( flags & 0x04 ){
212386	/* Superficial checking only - accomplished by the
212387	** jsonFuncArgMightBeBinary() call above. */
212388	res = 1;
212389	}else if( flags & 0x08 ){
212390	/* Strict checking. Check by translating BLOB->TEXT->BLOB. If
212391	** no errors occur, call that a "strict check". */
212392	JsonParse px;
212393	u32 iErr;
212394	memset(&px, 0, sizeof(px));
212395	px.aBlob = (u8*)sqlite3_value_blob(argv[0]);
212396	px.nBlob = sqlite3_value_bytes(argv[0]);
212397	iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1);
212398	res = iErr==0;
212399	}
212400	break;
212401	}
212402	/* Fall through into interpreting the input as text. See note
212403	** above at tag-20240123-a. */
	@@ -212451,13 +213142,11 @@
212451
212452	assert( argc==1 );
212453	UNUSED_PARAMETER(argc);
212454	memset(&s, 0, sizeof(s));
212455	s.db = sqlite3_context_db_handle(ctx);
212456	if( jsonFuncArgMightBeBinary(argv[0]) ){
212457	s.aBlob = (u8*)sqlite3_value_blob(argv[0]);
212458	s.nBlob = sqlite3_value_bytes(argv[0]);
212459	iErrPos = (i64)jsonbValidityCheck(&s, 0, s.nBlob, 1);
212460	}else{
212461	s.zJson = (char*)sqlite3_value_text(argv[0]);
212462	if( s.zJson==0 ) return; /* NULL input or OOM */
212463	s.nJson = sqlite3_value_bytes(argv[0]);
	@@ -212614,22 +213303,24 @@
212614	const char *z;
212615	u32 n;
212616	UNUSED_PARAMETER(argc);
212617	pStr = (JsonString)sqlite3_aggregate_context(ctx, sizeof(pStr));
212618	if( pStr ){


212619	if( pStr->zBuf==0 ){
212620	jsonStringInit(pStr, ctx);
212621	jsonAppendChar(pStr, '{');
212622	}else if( pStr->nUsed>1 ){
212623	jsonAppendChar(pStr, ',');
212624	}
212625	pStr->pCtx = ctx;
212626	z = (const char*)sqlite3_value_text(argv[0]);
212627	n = sqlite3Strlen30(z);
212628	jsonAppendString(pStr, z, n);
212629	jsonAppendChar(pStr, ':');
212630	jsonAppendSqlValue(pStr, argv[1]);
212631	}
212632	}
212633	static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
212634	JsonString *pStr;
212635	pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
	@@ -213138,13 +213829,12 @@
213138	jsonEachCursorReset(p);
213139	if( idxNum==0 ) return SQLITE_OK;
213140	memset(&p->sParse, 0, sizeof(p->sParse));
213141	p->sParse.nJPRef = 1;
213142	p->sParse.db = p->db;
213143	if( jsonFuncArgMightBeBinary(argv[0]) ){
213144	p->sParse.nBlob = sqlite3_value_bytes(argv[0]);
213145	p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]);
213146	}else{
213147	p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
213148	p->sParse.nJson = sqlite3_value_bytes(argv[0]);
213149	if( p->sParse.zJson==0 ){
213150	p->i = p->iEnd = 0;
	@@ -213434,10 +214124,12 @@
213434	#else
213435	/* #include "sqlite3.h" */
213436	#endif
213437	SQLITE_PRIVATE int sqlite3GetToken(const unsigned char,int); /* In the SQLite core */
213438


213439	/*
213440	** If building separately, we will need some setup that is normally
213441	** found in sqliteInt.h
213442	*/
213443	#if !defined(SQLITE_AMALGAMATION)
	@@ -213465,11 +214157,11 @@
213465	#else
213466	# define ALWAYS(X) (X)
213467	# define NEVER(X) (X)
213468	#endif
213469	#ifndef offsetof
213470	#define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
213471	#endif
213472	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
213473	# define FLEXARRAY
213474	#else
213475	# define FLEXARRAY 1
	@@ -214503,10 +215195,16 @@
214503	pStmt = pCsr->pReadAux;
214504	memset(pCsr, 0, sizeof(RtreeCursor));
214505	pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
214506	pCsr->pReadAux = pStmt;
214507






214508	}
214509
214510	/*
214511	** Rtree virtual table module xClose method.
214512	*/
	@@ -227782,11 +228480,12 @@
227782	DbpageTable pTab = (DbpageTable )pCursor->pVtab;
227783	int rc;
227784	sqlite3 *db = pTab->db;
227785	Btree *pBt;
227786
227787	(void)idxStr;

227788
227789	/* Default setting is no rows of result */
227790	pCsr->pgno = 1;
227791	pCsr->mxPgno = 0;
227792
	@@ -231444,18 +232143,19 @@
231444	/*
231445	** If the SessionInput object passed as the only argument is a streaming
231446	** object and the buffer is full, discard some data to free up space.
231447	*/
231448	static void sessionDiscardData(SessionInput *pIn){
231449	if( pIn->xInput && pIn->iNext>=sessions_strm_chunk_size ){
231450	int nMove = pIn->buf.nBuf - pIn->iNext;
231451	assert( nMove>=0 );
231452	if( nMove>0 ){
231453	memmove(pIn->buf.aBuf, &pIn->buf.aBuf[pIn->iNext], nMove);
231454	}
231455	pIn->buf.nBuf -= pIn->iNext;
231456	pIn->iNext = 0;

231457	pIn->nData = pIn->buf.nBuf;
231458	}
231459	}
231460
231461	/*
	@@ -231805,12 +232505,12 @@
231805	** sufficient either for the 'T' or 'P' byte and the varint that follows
231806	** it, or for the two single byte values otherwise. */
231807	p->rc = sessionInputBuffer(&p->in, 2);
231808	if( p->rc!=SQLITE_OK ) return p->rc;
231809
231810	sessionDiscardData(&p->in);
231811	p->in.iCurrent = p->in.iNext;

231812
231813	/* If the iterator is already at the end of the changeset, return DONE. */
231814	if( p->in.iNext>=p->in.nData ){
231815	return SQLITE_DONE;
231816	}
	@@ -233229,10 +233929,14 @@
233229	sqlite3_changeset_iter pIter, / Changeset to apply */
233230	int(*xFilter)(
233231	void pCtx, / Copy of sixth arg to _apply() */
233232	const char zTab / Table name */
233233	),




233234	int(*xConflict)(
233235	void pCtx, / Copy of fifth arg to _apply() */
233236	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233237	sqlite3_changeset_iter p / Handle describing change and conflict */
233238	),
	@@ -233368,10 +234072,13 @@
233368	}
233369
233370	/* If there is a schema mismatch on the current table, proceed to the
233371	** next change. A log message has already been issued. */
233372	if( schemaMismatch ) continue;



233373
233374	rc = sessionApplyOneWithRetry(db, pIter, &sApply, xConflict, pCtx);
233375	}
233376
233377	bPatchset = pIter->bPatchset;
	@@ -233435,10 +234142,91 @@
233435	db->aDb[0].pSchema->schema_cookie -= 32;
233436	}
233437	sqlite3_mutex_leave(sqlite3_db_mutex(db));
233438	return rc;
233439	}

















































































233440
233441	/*
233442	** Apply the changeset passed via pChangeset/nChangeset to the main
233443	** database attached to handle "db".
233444	*/
	@@ -233457,21 +234245,43 @@
233457	),
233458	void pCtx, / First argument passed to xConflict */
233459	void *ppRebase, int pnRebase,
233460	int flags
233461	){
233462	sqlite3_changeset_iter pIter; / Iterator to skip through changeset */
233463	int bInv = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
233464	int rc = sessionChangesetStart(&pIter, 0, 0, nChangeset, pChangeset, bInv, 1);
233465
233466	if( rc==SQLITE_OK ){
233467	rc = sessionChangesetApply(
233468	db, pIter, xFilter, xConflict, pCtx, ppRebase, pnRebase, flags
233469	);
233470	}
233471
233472	return rc;






















233473	}
233474
233475	/*
233476	** Apply the changeset passed via pChangeset/nChangeset to the main database
233477	** attached to handle "db". Invoke the supplied conflict handler callback
	@@ -233490,20 +234300,45 @@
233490	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233491	sqlite3_changeset_iter p / Handle describing change and conflict */
233492	),
233493	void pCtx / First argument passed to xConflict */
233494	){
233495	return sqlite3changeset_apply_v2(
233496	db, nChangeset, pChangeset, xFilter, xConflict, pCtx, 0, 0, 0


233497	);
233498	}
233499
233500	/*
233501	** Apply the changeset passed via xInput/pIn to the main database
233502	** attached to handle "db". Invoke the supplied conflict handler callback
233503	** to resolve any conflicts encountered while applying the change.
233504	*/























233505	SQLITE_API int sqlite3changeset_apply_v2_strm(
233506	sqlite3 db, / Apply change to "main" db of this handle */
233507	int (xInput)(void pIn, void pData, int pnData), /* Input function */
233508	void pIn, / First arg for xInput */
233509	int(*xFilter)(
	@@ -233517,19 +234352,15 @@
233517	),
233518	void pCtx, / First argument passed to xConflict */
233519	void *ppRebase, int pnRebase,
233520	int flags
233521	){
233522	sqlite3_changeset_iter pIter; / Iterator to skip through changeset */
233523	int bInverse = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
233524	int rc = sessionChangesetStart(&pIter, xInput, pIn, 0, 0, bInverse, 1);
233525	if( rc==SQLITE_OK ){
233526	rc = sessionChangesetApply(
233527	db, pIter, xFilter, xConflict, pCtx, ppRebase, pnRebase, flags
233528	);
233529	}
233530	return rc;
233531	}
233532	SQLITE_API int sqlite3changeset_apply_strm(
233533	sqlite3 db, / Apply change to "main" db of this handle */
233534	int (xInput)(void pIn, void pData, int pnData), /* Input function */
233535	void pIn, / First arg for xInput */
	@@ -233542,12 +234373,14 @@
233542	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233543	sqlite3_changeset_iter p / Handle describing change and conflict */
233544	),
233545	void pCtx / First argument passed to xConflict */
233546	){
233547	return sqlite3changeset_apply_v2_strm(
233548	db, xInput, pIn, xFilter, xConflict, pCtx, 0, 0, 0


233549	);
233550	}
233551
233552	/*
233553	** sqlite3_changegroup handle.
	@@ -234165,18 +234998,23 @@
234165	*/
234166	SQLITE_API int sqlite3changegroup_add_change(
234167	sqlite3_changegroup *pGrp,
234168	sqlite3_changeset_iter *pIter
234169	){


234170	if( pIter->in.iCurrent==pIter->in.iNext
234171	\|\| pIter->rc!=SQLITE_OK
234172	\|\| pIter->bInvert
234173	){
234174	/* Iterator does not point to any valid entry or is an INVERT iterator. */
234175	return SQLITE_ERROR;



234176	}
234177	return sessionOneChangeToHash(pGrp, pIter, 0);
234178	}
234179
234180	/*
234181	** Obtain a buffer containing a changeset representing the concatenation
234182	** of all changesets added to the group so far.
	@@ -235470,10 +236308,11 @@
235470	/* #include "sqlite3ext.h" */
235471	SQLITE_EXTENSION_INIT1
235472
235473	/* #include <string.h> */
235474	/* #include <assert.h> */

235475
235476	#ifndef SQLITE_AMALGAMATION
235477
235478	typedef unsigned char u8;
235479	typedef unsigned int u32;
	@@ -235529,11 +236368,11 @@
235529
235530	/*
235531	** Macros needed to provide flexible arrays in a portable way
235532	*/
235533	#ifndef offsetof
235534	# define offsetof(STRUCTURE,FIELD) ((size_t)((char)&((STRUCTURE)0)->FIELD))
235535	#endif
235536	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
235537	# define FLEXARRAY
235538	#else
235539	# define FLEXARRAY 1
	@@ -244713,10 +245552,40 @@
244713	Fts5Buffer term; /* Current term */
244714	i64 iRowid; /* Current rowid */
244715	int nPos; /* Number of bytes in current position list */
244716	u8 bDel; /* True if the delete flag is set */
244717	};






























244718
244719	/*
244720	** Array of tombstone pages. Reference counted.
244721	*/
244722	struct Fts5TombstoneArray {
	@@ -245003,11 +245872,11 @@
245003	/* If either of the sqlite3_blob_open() or sqlite3_blob_reopen() calls
245004	** above returned SQLITE_ERROR, return SQLITE_CORRUPT_VTAB instead.
245005	** All the reasons those functions might return SQLITE_ERROR - missing
245006	** table, missing row, non-blob/text in block column - indicate
245007	** backing store corruption. */
245008	if( rc==SQLITE_ERROR ) rc = FTS5_CORRUPT;
245009
245010	if( rc==SQLITE_OK ){
245011	u8 aOut = 0; / Read blob data into this buffer */
245012	int nByte = sqlite3_blob_bytes(p->pReader);
245013	int szData = (sizeof(Fts5Data) + 7) & ~7;
	@@ -245053,11 +245922,11 @@
245053
245054	static Fts5Data fts5LeafRead(Fts5Index p, i64 iRowid){
245055	Fts5Data *pRet = fts5DataRead(p, iRowid);
245056	if( pRet ){
245057	if( pRet->nn<4 \|\| pRet->szLeaf>pRet->nn ){
245058	p->rc = FTS5_CORRUPT;
245059	fts5DataRelease(pRet);
245060	pRet = 0;
245061	}
245062	}
245063	return pRet;
	@@ -245412,12 +246281,18 @@
245412	pData = fts5DataRead(p, FTS5_STRUCTURE_ROWID);
245413	if( p->rc==SQLITE_OK ){
245414	/* TODO: Do we need this if the leaf-index is appended? Probably... */
245415	memset(&pData->p[pData->nn], 0, FTS5_DATA_PADDING);
245416	p->rc = fts5StructureDecode(pData->p, pData->nn, &iCookie, &pRet);
245417	if( p->rc==SQLITE_OK && (pConfig->pgsz==0 \|\| pConfig->iCookie!=iCookie) ){
245418	p->rc = sqlite3Fts5ConfigLoad(pConfig, iCookie);






245419	}
245420	fts5DataRelease(pData);
245421	if( p->rc!=SQLITE_OK ){
245422	fts5StructureRelease(pRet);
245423	pRet = 0;
	@@ -246036,11 +246911,11 @@
246036
246037	ASSERT_SZLEAF_OK(pIter->pLeaf);
246038	while( iOff>=pIter->pLeaf->szLeaf ){
246039	fts5SegIterNextPage(p, pIter);
246040	if( pIter->pLeaf==0 ){
246041	if( p->rc==SQLITE_OK ) p->rc = FTS5_CORRUPT;
246042	return;
246043	}
246044	iOff = 4;
246045	a = pIter->pLeaf->p;
246046	}
	@@ -246068,11 +246943,11 @@
246068	i64 iOff = pIter->iLeafOffset; /* Offset to read at */
246069	int nNew; /* Bytes of new data */
246070
246071	iOff += fts5GetVarint32(&a[iOff], nNew);
246072	if( iOff+nNew>pIter->pLeaf->szLeaf \|\| nKeep>pIter->term.n \|\| nNew==0 ){
246073	p->rc = FTS5_CORRUPT;
246074	return;
246075	}
246076	pIter->term.n = nKeep;
246077	fts5BufferAppendBlob(&p->rc, &pIter->term, nNew, &a[iOff]);
246078	assert( pIter->term.n<=pIter->term.nSpace );
	@@ -246110,13 +246985,13 @@
246110	** Allocate a tombstone hash page array object (pIter->pTombArray) for
246111	** the iterator passed as the second argument. If an OOM error occurs,
246112	** leave an error in the Fts5Index object.
246113	*/
246114	static void fts5SegIterAllocTombstone(Fts5Index p, Fts5SegIter pIter){
246115	const int nTomb = pIter->pSeg->nPgTombstone;
246116	if( nTomb>0 ){
246117	int nByte = SZ_FTS5TOMBSTONEARRAY(nTomb+1);
246118	Fts5TombstoneArray *pNew;
246119	pNew = (Fts5TombstoneArray*)sqlite3Fts5MallocZero(&p->rc, nByte);
246120	if( pNew ){
246121	pNew->nTombstone = nTomb;
246122	pNew->nRef = 1;
	@@ -246263,11 +247138,11 @@
246263	}else{
246264	int iRowidOff;
246265	iRowidOff = fts5LeafFirstRowidOff(pNew);
246266	if( iRowidOff ){
246267	if( iRowidOff>=pNew->szLeaf ){
246268	p->rc = FTS5_CORRUPT;
246269	}else{
246270	pIter->pLeaf = pNew;
246271	pIter->iLeafOffset = iRowidOff;
246272	}
246273	}
	@@ -246497,11 +247372,11 @@
246497	pIter->iEndofDoclist = iOff;
246498	bNewTerm = 1;
246499	}
246500	assert_nc( iOff<pLeaf->szLeaf );
246501	if( iOff>pLeaf->szLeaf ){
246502	p->rc = FTS5_CORRUPT;
246503	return;
246504	}
246505	}
246506	}
246507
	@@ -246605,22 +247480,24 @@
246605	if( pLast ){
246606	int iOff;
246607	fts5DataRelease(pIter->pLeaf);
246608	pIter->pLeaf = pLast;
246609	pIter->iLeafPgno = pgnoLast;
246610	iOff = fts5LeafFirstRowidOff(pLast);
246611	if( iOff>pLast->szLeaf ){
246612	p->rc = FTS5_CORRUPT;
246613	return;
246614	}
246615	iOff += fts5GetVarint(&pLast->p[iOff], (u64*)&pIter->iRowid);
246616	pIter->iLeafOffset = iOff;
246617
246618	if( fts5LeafIsTermless(pLast) ){
246619	pIter->iEndofDoclist = pLast->nn+1;
246620	}else{
246621	pIter->iEndofDoclist = fts5LeafFirstTermOff(pLast);


246622	}
246623	}
246624
246625	fts5SegIterReverseInitPage(p, pIter);
246626	}
	@@ -246686,11 +247563,11 @@
246686
246687	iPgidx = (u32)pIter->pLeaf->szLeaf;
246688	iPgidx += fts5GetVarint32(&a[iPgidx], iTermOff);
246689	iOff = iTermOff;
246690	if( iOff>n ){
246691	p->rc = FTS5_CORRUPT;
246692	return;
246693	}
246694
246695	while( 1 ){
246696
	@@ -246729,11 +247606,11 @@
246729	iPgidx += fts5GetVarint32(&a[iPgidx], nKeep);
246730	iTermOff += nKeep;
246731	iOff = iTermOff;
246732
246733	if( iOff>=n ){
246734	p->rc = FTS5_CORRUPT;
246735	return;
246736	}
246737
246738	/* Read the nKeep field of the next term. */
246739	fts5FastGetVarint32(a, iOff, nKeep);
	@@ -246751,11 +247628,11 @@
246751	a = pIter->pLeaf->p;
246752	if( fts5LeafIsTermless(pIter->pLeaf)==0 ){
246753	iPgidx = (u32)pIter->pLeaf->szLeaf;
246754	iPgidx += fts5GetVarint32(&pIter->pLeaf->p[iPgidx], iOff);
246755	if( iOff<4 \|\| (i64)iOff>=pIter->pLeaf->szLeaf ){
246756	p->rc = FTS5_CORRUPT;
246757	return;
246758	}else{
246759	nKeep = 0;
246760	iTermOff = iOff;
246761	n = (u32)pIter->pLeaf->nn;
	@@ -246766,11 +247643,11 @@
246766	}while( 1 );
246767	}
246768
246769	search_success:
246770	if( (i64)iOff+nNew>n \|\| nNew<1 ){
246771	p->rc = FTS5_CORRUPT;
246772	return;
246773	}
246774	pIter->iLeafOffset = iOff + nNew;
246775	pIter->iTermLeafOffset = pIter->iLeafOffset;
246776	pIter->iTermLeafPgno = pIter->iLeafPgno;
	@@ -247231,11 +248108,11 @@
247231	int iLeafPgno
247232	){
247233	assert( iLeafPgno>pIter->iLeafPgno );
247234
247235	if( iLeafPgno>pIter->pSeg->pgnoLast ){
247236	p->rc = FTS5_CORRUPT;
247237	}else{
247238	fts5DataRelease(pIter->pNextLeaf);
247239	pIter->pNextLeaf = 0;
247240	pIter->iLeafPgno = iLeafPgno-1;
247241
	@@ -247246,11 +248123,11 @@
247246	iOff = fts5LeafFirstRowidOff(pIter->pLeaf);
247247	if( iOff>0 ){
247248	u8 *a = pIter->pLeaf->p;
247249	int n = pIter->pLeaf->szLeaf;
247250	if( iOff<4 \|\| iOff>=n ){
247251	p->rc = FTS5_CORRUPT;
247252	}else{
247253	iOff += fts5GetVarint(&a[iOff], (u64*)&pIter->iRowid);
247254	pIter->iLeafOffset = iOff;
247255	fts5SegIterLoadNPos(p, pIter);
247256	}
	@@ -247725,11 +248602,11 @@
247725	nRem -= nChunk;
247726	fts5DataRelease(pData);
247727	if( nRem<=0 ){
247728	break;
247729	}else if( pSeg->pSeg==0 ){
247730	p->rc = FTS5_CORRUPT;
247731	return;
247732	}else{
247733	pgno++;
247734	pData = fts5LeafRead(p, FTS5_SEGMENT_ROWID(pSeg->pSeg->iSegid, pgno));
247735	if( pData==0 ) break;
	@@ -248828,11 +249705,11 @@
248828	if( iOff>pData->szLeaf ){
248829	/* This can occur if the pages that the segments occupy overlap - if
248830	** a single page has been assigned to more than one segment. In
248831	** this case a prior iteration of this loop may have corrupted the
248832	** segment currently being trimmed. */
248833	p->rc = FTS5_CORRUPT;
248834	}else{
248835	fts5BufferZero(&buf);
248836	fts5BufferGrow(&p->rc, &buf, pData->nn);
248837	fts5BufferAppendBlob(&p->rc, &buf, sizeof(aHdr), aHdr);
248838	fts5BufferAppendVarint(&p->rc, &buf, pSeg->term.n);
	@@ -249295,11 +250172,11 @@
249295	fts5DataRelease(pLeaf);
249296	pLeaf = 0;
249297	}else if( bDetailNone ){
249298	break;
249299	}else if( iNext>=pLeaf->szLeaf \|\| pLeaf->nn<pLeaf->szLeaf \|\| iNext<4 ){
249300	p->rc = FTS5_CORRUPT;
249301	break;
249302	}else{
249303	int nShift = iNext - 4;
249304	int nPg;
249305
	@@ -249315,11 +250192,11 @@
249315	int i1 = pLeaf->szLeaf;
249316	int i2 = 0;
249317
249318	i1 += fts5GetVarint32(&aPg[i1], iFirst);
249319	if( iFirst<iNext ){
249320	p->rc = FTS5_CORRUPT;
249321	break;
249322	}
249323	aIdx = sqlite3Fts5MallocZero(&p->rc, (pLeaf->nn-pLeaf->szLeaf)+2);
249324	if( aIdx==0 ) break;
249325	i2 = sqlite3Fts5PutVarint(aIdx, iFirst-nShift);
	@@ -249538,18 +250415,18 @@
249538
249539	nPrefix = MIN(nPrefix, nPrefix2);
249540	nSuffix = (nPrefix2 + nSuffix2) - nPrefix;
249541
249542	if( (iKeyOff+nSuffix)>iPgIdx \|\| (iNextOff+nSuffix2)>iPgIdx ){
249543	p->rc = FTS5_CORRUPT;
249544	}else{
249545	if( iKey!=1 ){
249546	iOff += sqlite3Fts5PutVarint(&aPg[iOff], nPrefix);
249547	}
249548	iOff += sqlite3Fts5PutVarint(&aPg[iOff], nSuffix);
249549	if( nPrefix2>pSeg->term.n ){
249550	p->rc = FTS5_CORRUPT;
249551	}else if( nPrefix2>nPrefix ){
249552	memcpy(&aPg[iOff], &pSeg->term.p[nPrefix], nPrefix2-nPrefix);
249553	iOff += (nPrefix2-nPrefix);
249554	}
249555	memmove(&aPg[iOff], &aPg[iNextOff], nSuffix2);
	@@ -249969,11 +250846,11 @@
249969	}
249970	assert( pStruct->aLevel[i].nMerge<=nThis );
249971	}
249972
249973	nByte += (((i64)pStruct->nLevel)+1) * sizeof(Fts5StructureLevel);
249974	assert( nByte==SZ_FTS5STRUCTURE(pStruct->nLevel+2) );
249975	pNew = (Fts5Structure*)sqlite3Fts5MallocZero(&p->rc, nByte);
249976
249977	if( pNew ){
249978	Fts5StructureLevel *pLvl;
249979	nByte = nSeg * sizeof(Fts5StructureSegment);
	@@ -250338,11 +251215,11 @@
250338	fts5PrefixMergerInsertByPosition(&pHead, pSave);
250339	pSave = pNext;
250340	}
250341
250342	if( pHead==0 \|\| pHead->pNext==0 ){
250343	p->rc = FTS5_CORRUPT;
250344	break;
250345	}
250346
250347	/* See the earlier comment in this function for an explanation of why
250348	** corrupt input position lists might cause the output to consume
	@@ -250375,11 +251252,11 @@
250375
250376	/* WRITEPOSLISTSIZE */
250377	assert_nc( tmp.n+nTail<=nTmp );
250378	assert( tmp.n+nTail<=nTmp+nMerge*10 );
250379	if( tmp.n+nTail>nTmp-FTS5_DATA_ZERO_PADDING ){
250380	if( p->rc==SQLITE_OK ) p->rc = FTS5_CORRUPT;
250381	break;
250382	}
250383	fts5BufferSafeAppendVarint(&out, (tmp.n+nTail) * 2);
250384	fts5BufferSafeAppendBlob(&out, tmp.p, tmp.n);
250385	if( nTail>0 ){
	@@ -252408,23 +253285,31 @@
252408	}
252409
252410	/*
252411	** This function is also purely an internal test. It does not contribute to
252412	** FTS functionality, or even the integrity-check, in any way.



252413	*/
252414	static void fts5TestTerm(
252415	Fts5Index *p,
252416	Fts5Buffer pPrev, / Previous term */
252417	const char z, int n, / Possibly new term to test */
252418	u64 expected,
252419	u64 *pCksum

252420	){
252421	int rc = p->rc;
252422	if( pPrev->n==0 ){
252423	fts5BufferSet(&rc, pPrev, n, (const u8*)z);
252424	}else
252425	if( rc==SQLITE_OK && (pPrev->n!=n \|\| memcmp(pPrev->p, z, n)) ){




252426	u64 cksum3 = *pCksum;
252427	const char zTerm = (const char)&pPrev->p[1]; /* term sans prefix-byte */
252428	int nTerm = pPrev->n-1; /* Size of zTerm in bytes */
252429	int iIdx = (pPrev->p[0] - FTS5_MAIN_PREFIX);
252430	int flags = (iIdx==0 ? 0 : FTS5INDEX_QUERY_PREFIX);
	@@ -252470,20 +253355,20 @@
252470
252471	cksum3 ^= ck1;
252472	fts5BufferSet(&rc, pPrev, n, (const u8*)z);
252473
252474	if( rc==SQLITE_OK && cksum3!=expected ){
252475	rc = FTS5_CORRUPT;
252476	}
252477	*pCksum = cksum3;
252478	}
252479	p->rc = rc;
252480	}
252481
252482	#else
252483	# define fts5TestDlidxReverse(x,y,z)
252484	# define fts5TestTerm(u,v,w,x,y,z)
252485	#endif
252486
252487	/*
252488	** Check that:
252489	**
	@@ -252504,18 +253389,21 @@
252504	/* Now check that the iter.nEmpty leaves following the current leaf
252505	** (a) exist and (b) contain no terms. */
252506	for(i=iFirst; p->rc==SQLITE_OK && i<=iLast; i++){
252507	Fts5Data *pLeaf = fts5DataRead(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
252508	if( pLeaf ){
252509	if( !fts5LeafIsTermless(pLeaf) ) p->rc = FTS5_CORRUPT;
252510	if( i>=iNoRowid && 0!=fts5LeafFirstRowidOff(pLeaf) ) p->rc = FTS5_CORRUPT;



252511	}
252512	fts5DataRelease(pLeaf);
252513	}
252514	}
252515
252516	static void fts5IntegrityCheckPgidx(Fts5Index p, Fts5Data pLeaf){
252517	i64 iTermOff = 0;
252518	int ii;
252519
252520	Fts5Buffer buf1 = {0,0,0};
252521	Fts5Buffer buf2 = {0,0,0};
	@@ -252529,33 +253417,33 @@
252529	ii += fts5GetVarint32(&pLeaf->p[ii], nIncr);
252530	iTermOff += nIncr;
252531	iOff = iTermOff;
252532
252533	if( iOff>=pLeaf->szLeaf ){
252534	p->rc = FTS5_CORRUPT;
252535	}else if( iTermOff==nIncr ){
252536	int nByte;
252537	iOff += fts5GetVarint32(&pLeaf->p[iOff], nByte);
252538	if( (iOff+nByte)>pLeaf->szLeaf ){
252539	p->rc = FTS5_CORRUPT;
252540	}else{
252541	fts5BufferSet(&p->rc, &buf1, nByte, &pLeaf->p[iOff]);
252542	}
252543	}else{
252544	int nKeep, nByte;
252545	iOff += fts5GetVarint32(&pLeaf->p[iOff], nKeep);
252546	iOff += fts5GetVarint32(&pLeaf->p[iOff], nByte);
252547	if( nKeep>buf1.n \|\| (iOff+nByte)>pLeaf->szLeaf ){
252548	p->rc = FTS5_CORRUPT;
252549	}else{
252550	buf1.n = nKeep;
252551	fts5BufferAppendBlob(&p->rc, &buf1, nByte, &pLeaf->p[iOff]);
252552	}
252553
252554	if( p->rc==SQLITE_OK ){
252555	res = fts5BufferCompare(&buf1, &buf2);
252556	if( res<=0 ) p->rc = FTS5_CORRUPT;
252557	}
252558	}
252559	fts5BufferSet(&p->rc, &buf2, buf1.n, buf1.p);
252560	}
252561
	@@ -252612,11 +253500,11 @@
252612	){
252613	/* special case - the very first page in a segment keeps its %_idx
252614	** entry even if all the terms are removed from it by secure-delete
252615	** operations. */
252616	}else{
252617	p->rc = FTS5_CORRUPT;
252618	}
252619
252620	}else{
252621	int iOff; /* Offset of first term on leaf */
252622	int iRowidOff; /* Offset of first rowid on leaf */
	@@ -252624,19 +253512,19 @@
252624	int res; /* Comparison of term and split-key */
252625
252626	iOff = fts5LeafFirstTermOff(pLeaf);
252627	iRowidOff = fts5LeafFirstRowidOff(pLeaf);
252628	if( iRowidOff>=iOff \|\| iOff>=pLeaf->szLeaf ){
252629	p->rc = FTS5_CORRUPT;
252630	}else{
252631	iOff += fts5GetVarint32(&pLeaf->p[iOff], nTerm);
252632	res = fts5Memcmp(&pLeaf->p[iOff], zIdxTerm, MIN(nTerm, nIdxTerm));
252633	if( res==0 ) res = nTerm - nIdxTerm;
252634	if( res<0 ) p->rc = FTS5_CORRUPT;
252635	}
252636
252637	fts5IntegrityCheckPgidx(p, pLeaf);
252638	}
252639	fts5DataRelease(pLeaf);
252640	if( p->rc ) break;
252641
252642	/* Now check that the iter.nEmpty leaves following the current leaf
	@@ -252662,11 +253550,11 @@
252662	/* Check any rowid-less pages that occur before the current leaf. */
252663	for(iPg=iPrevLeaf+1; iPg<fts5DlidxIterPgno(pDlidx); iPg++){
252664	iKey = FTS5_SEGMENT_ROWID(iSegid, iPg);
252665	pLeaf = fts5DataRead(p, iKey);
252666	if( pLeaf ){
252667	if( fts5LeafFirstRowidOff(pLeaf)!=0 ) p->rc = FTS5_CORRUPT;
252668	fts5DataRelease(pLeaf);
252669	}
252670	}
252671	iPrevLeaf = fts5DlidxIterPgno(pDlidx);
252672
	@@ -252677,16 +253565,16 @@
252677	if( pLeaf ){
252678	i64 iRowid;
252679	int iRowidOff = fts5LeafFirstRowidOff(pLeaf);
252680	ASSERT_SZLEAF_OK(pLeaf);
252681	if( iRowidOff>=pLeaf->szLeaf ){
252682	p->rc = FTS5_CORRUPT;
252683	}else if( bSecureDelete==0 \|\| iRowidOff>0 ){
252684	i64 iDlRowid = fts5DlidxIterRowid(pDlidx);
252685	fts5GetVarint(&pLeaf->p[iRowidOff], (u64*)&iRowid);
252686	if( iRowid<iDlRowid \|\| (bSecureDelete==0 && iRowid!=iDlRowid) ){
252687	p->rc = FTS5_CORRUPT;
252688	}
252689	}
252690	fts5DataRelease(pLeaf);
252691	}
252692	}
	@@ -252734,10 +253622,11 @@
252734
252735	#ifdef SQLITE_DEBUG
252736	/* Used by extra internal tests only run if NDEBUG is not defined */
252737	u64 cksum3 = 0; /* Checksum based on contents of indexes */
252738	Fts5Buffer term = {0,0,0}; /* Buffer used to hold most recent term */

252739	#endif
252740	const int flags = FTS5INDEX_QUERY_NOOUTPUT;
252741
252742	/* Load the FTS index structure */
252743	pStruct = fts5StructureRead(p);
	@@ -252776,11 +253665,11 @@
252776	int iOff = 0; /* Offset within poslist */
252777	i64 iRowid = fts5MultiIterRowid(pIter);
252778	char z = (char)fts5MultiIterTerm(pIter, &n);
252779
252780	/* If this is a new term, query for it. Update cksum3 with the results. */
252781	fts5TestTerm(p, &term, z, n, cksum2, &cksum3);
252782	if( p->rc ) break;
252783
252784	if( eDetail==FTS5_DETAIL_NONE ){
252785	if( 0==fts5MultiIterIsEmpty(p, pIter) ){
252786	cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n);
	@@ -252794,19 +253683,30 @@
252794	int iTokOff = FTS5_POS2OFFSET(iPos);
252795	cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, iCol, iTokOff, -1, z, n);
252796	}
252797	}
252798	}
252799	fts5TestTerm(p, &term, 0, 0, cksum2, &cksum3);
252800
252801	fts5MultiIterFree(pIter);
252802	if( p->rc==SQLITE_OK && bUseCksum && cksum!=cksum2 ) p->rc = FTS5_CORRUPT;
252803
252804	fts5StructureRelease(pStruct);



252805	#ifdef SQLITE_DEBUG






252806	fts5BufferFree(&term);
252807	#endif


252808	fts5BufferFree(&poslist);
252809	return fts5IndexReturn(p);
252810	}
252811
252812	/*************************************************************************
	@@ -257213,11 +258113,11 @@
257213	int nArg, /* Number of args */
257214	sqlite3_value *apUnused / Function arguments */
257215	){
257216	assert( nArg==0 );
257217	UNUSED_PARAM2(nArg, apUnused);
257218	sqlite3_result_text(pCtx, "fts5: 2025-04-15 21:59:38 d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5", -1, SQLITE_TRANSIENT);
257219	}
257220
257221	/*
257222	** Implementation of fts5_locale(LOCALE, TEXT) function.
257223	**
	@@ -257336,12 +258236,13 @@
257336	}else{
257337	*pzErr = sqlite3_mprintf("unable to validate the inverted index for"
257338	" FTS5 table %s.%s: %s",
257339	zSchema, zTabname, sqlite3_errstr(rc));
257340	}


257341	}
257342
257343	sqlite3Fts5IndexCloseReader(pTab->p.pIndex);
257344	pTab->p.pConfig->pzErrmsg = 0;
257345
257346	return rc;
257347	}
	@@ -258028,10 +258929,11 @@
258028	ctx.pStorage = p;
258029	ctx.iCol = -1;
258030	for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){
258031	if( pConfig->abUnindexed[iCol-1]==0 ){
258032	sqlite3_value *pVal = 0;

258033	const char *pText = 0;
258034	int nText = 0;
258035	const char *pLoc = 0;
258036	int nLoc = 0;
258037
	@@ -258044,15 +258946,26 @@
258044	}
258045
258046	if( pConfig->bLocale && sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
258047	rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
258048	}else{
258049	pText = (const char*)sqlite3_value_text(pVal);
258050	nText = sqlite3_value_bytes(pVal);
258051	if( pConfig->bLocale && pSeek ){
258052	pLoc = (const char*)sqlite3_column_text(pSeek, iCol + pConfig->nCol);
258053	nLoc = sqlite3_column_bytes(pSeek, iCol + pConfig->nCol);











258054	}
258055	}
258056
258057	if( rc==SQLITE_OK ){
258058	sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
	@@ -258064,10 +258977,11 @@
258064	if( rc==SQLITE_OK && p->aTotalSize[iCol-1]<0 ){
258065	rc = FTS5_CORRUPT;
258066	}
258067	sqlite3Fts5ClearLocale(pConfig);
258068	}

258069	}
258070	}
258071	if( rc==SQLITE_OK && p->nTotalRow<1 ){
258072	rc = FTS5_CORRUPT;
258073	}else{
258074

	--- extsrc/sqlite3.c
	+++ extsrc/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.51.0. By combining all the individual C code files into this
4	** single large file, the entire code can be compiled as a single translation
5	** unit. This allows many compilers to do optimizations that would not be
6	** possible if the files were compiled separately. Performance improvements
7	** of 5% or more are commonly seen when SQLite is compiled as a single
8	** translation unit.
	@@ -16,11 +16,11 @@
16	** if you want a wrapper to interface SQLite with your choice of programming
17	** language. The code for the "sqlite3" command-line shell is also in a
18	** separate file. This file contains only code for the core SQLite library.
19	**
20	** The content in this amalgamation comes from Fossil check-in
21	** 9f184f8dfa5ef6d57e10376adc30e0060ced with changes in files:
22	**
23	**
24	*/
25	#ifndef SQLITE_AMALGAMATION
26	#define SQLITE_CORE 1
	@@ -463,13 +463,13 @@
463	**
464	** See also: [sqlite3_libversion()],
465	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466	** [sqlite_version()] and [sqlite_source_id()].
467	*/
468	#define SQLITE_VERSION "3.51.0"
469	#define SQLITE_VERSION_NUMBER 3051000
470	#define SQLITE_SOURCE_ID "2025-07-15 19:00:01 9f184f8dfa5ef6d57e10376adc30e0060ceda07d283c23dfdfe3dbdd6608f839"
471
472	/*
473	** CAPI3REF: Run-Time Library Version Numbers
474	** KEYWORDS: sqlite3_version sqlite3_sourceid
475	**
	@@ -485,13 +485,13 @@
485	** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
486	** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
487	** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
488	** </pre></blockquote>)^
489	**
490	** ^The sqlite3_version[] string constant contains the text of the
491	** [SQLITE_VERSION] macro. ^The sqlite3_libversion() function returns a
492	** pointer to the sqlite3_version[] string constant. The sqlite3_libversion()
493	** function is provided for use in DLLs since DLL users usually do not have
494	** direct access to string constants within the DLL. ^The
495	** sqlite3_libversion_number() function returns an integer equal to
496	** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
497	** a pointer to a string constant whose value is the same as the
	@@ -687,11 +687,11 @@
687	** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
688	** that allows an application to run multiple statements of SQL
689	** without having to use a lot of C code.
690	**
691	** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
692	** semicolon-separated SQL statements passed into its 2nd argument,
693	** in the context of the [database connection] passed in as its 1st
694	** argument. ^If the callback function of the 3rd argument to
695	** sqlite3_exec() is not NULL, then it is invoked for each result row
696	** coming out of the evaluated SQL statements. ^The 4th argument to
697	** sqlite3_exec() is relayed through to the 1st argument of each
	@@ -720,11 +720,11 @@
720	** callback is an array of pointers to strings obtained as if from
721	** [sqlite3_column_text()], one for each column. ^If an element of a
722	** result row is NULL then the corresponding string pointer for the
723	** sqlite3_exec() callback is a NULL pointer. ^The 4th argument to the
724	** sqlite3_exec() callback is an array of pointers to strings where each
725	** entry represents the name of a corresponding result column as obtained
726	** from [sqlite3_column_name()].
727	**
728	** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
729	** to an empty string, or a pointer that contains only whitespace and/or
730	** SQL comments, then no SQL statements are evaluated and the database
	@@ -906,11 +906,11 @@
906	** Applications should not depend on the historical behavior.
907	**
908	** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
909	** [sqlite3_open_v2()] does not cause the underlying database file
910	** to be opened using O_EXCL. Passing SQLITE_OPEN_EXCLUSIVE into
911	** [sqlite3_open_v2()] has historically been a no-op and might become an
912	** error in future versions of SQLite.
913	*/
914	#define SQLITE_OPEN_READONLY 0x00000001 /* Ok for sqlite3_open_v2() */
915	#define SQLITE_OPEN_READWRITE 0x00000002 /* Ok for sqlite3_open_v2() */
916	#define SQLITE_OPEN_CREATE 0x00000004 /* Ok for sqlite3_open_v2() */
	@@ -1000,11 +1000,11 @@
1000	** CAPI3REF: File Locking Levels
1001	**
1002	** SQLite uses one of these integer values as the second
1003	** argument to calls it makes to the xLock() and xUnlock() methods
1004	** of an [sqlite3_io_methods] object. These values are ordered from
1005	** least restrictive to most restrictive.
1006	**
1007	** The argument to xLock() is always SHARED or higher. The argument to
1008	** xUnlock is either SHARED or NONE.
1009	*/
1010	#define SQLITE_LOCK_NONE 0 /* xUnlock() only */
	@@ -1316,11 +1316,11 @@
1316	** reason, the entire database file will be overwritten by the current
1317	** transaction. This is used by VACUUM operations.
1318	**
1319	** <li>[[SQLITE_FCNTL_VFSNAME]]
1320	** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
1321	** all [VFSes] in the VFS stack. The names of all VFS shims and the
1322	** final bottom-level VFS are written into memory obtained from
1323	** [sqlite3_malloc()] and the result is stored in the char* variable
1324	** that the fourth parameter of [sqlite3_file_control()] points to.
1325	** The caller is responsible for freeing the memory when done. As with
1326	** all file-control actions, there is no guarantee that this will actually
	@@ -1330,11 +1330,11 @@
1330	**
1331	** <li>[[SQLITE_FCNTL_VFS_POINTER]]
1332	** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
1333	** [VFSes] currently in use. ^(The argument X in
1334	** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
1335	of type "[sqlite3_vfs] ". This opcode will set *X
1336	** to a pointer to the top-level VFS.)^
1337	** ^When there are multiple VFS shims in the stack, this opcode finds the
1338	** upper-most shim only.
1339	**
1340	** <li>[[SQLITE_FCNTL_PRAGMA]]
	@@ -1520,11 +1520,11 @@
1520	** record the fact that the pages have been checkpointed.
1521	**
1522	** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
1523	** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
1524	** whether or not there is a database client in another process with a wal-mode
1525	** transaction open on the database or not. It is only available on unix. The
1526	** (void*) argument passed with this file-control should be a pointer to a
1527	** value of type (int). The integer value is set to 1 if the database is a wal
1528	** mode database and there exists at least one client in another process that
1529	** currently has an SQL transaction open on the database. It is set to 0 if
1530	** the database is not a wal-mode db, or if there is no such connection in any
	@@ -1945,11 +1945,11 @@
1945	**
1946	** ^The sqlite3_initialize() routine is called internally by many other
1947	** SQLite interfaces so that an application usually does not need to
1948	** invoke sqlite3_initialize() directly. For example, [sqlite3_open()]
1949	** calls sqlite3_initialize() so the SQLite library will be automatically
1950	** initialized when [sqlite3_open()] is called if it has not been initialized
1951	** already. ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
1952	** compile-time option, then the automatic calls to sqlite3_initialize()
1953	** are omitted and the application must call sqlite3_initialize() directly
1954	** prior to using any other SQLite interface. For maximum portability,
1955	** it is recommended that applications always invoke sqlite3_initialize()
	@@ -2202,25 +2202,25 @@
2202	** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
2203	** is a pointer to an instance of the [sqlite3_mem_methods] structure.
2204	** The [sqlite3_mem_methods]
2205	** structure is filled with the currently defined memory allocation routines.)^
2206	** This option can be used to overload the default memory allocation
2207	** routines with a wrapper that simulates memory allocation failure or
2208	** tracks memory usage, for example. </dd>
2209	**
2210	** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
2211	** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes a single argument of
2212	** type int, interpreted as a boolean, which if true provides a hint to
2213	** SQLite that it should avoid large memory allocations if possible.
2214	** SQLite will run faster if it is free to make large memory allocations,
2215	** but some applications might prefer to run slower in exchange for
2216	** guarantees about memory fragmentation that are possible if large
2217	** allocations are avoided. This hint is normally off.
2218	** </dd>
2219	**
2220	** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
2221	** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes a single argument of type int,
2222	** interpreted as a boolean, which enables or disables the collection of
2223	** memory allocation statistics. ^(When memory allocation statistics are
2224	** disabled, the following SQLite interfaces become non-operational:
2225	** <ul>
2226	** <li> [sqlite3_hard_heap_limit64()]
	@@ -2261,11 +2261,11 @@
2261	** a page cache line is larger than sz bytes or if all of the pMem buffer
2262	** is exhausted.
2263	** ^If pMem is NULL and N is non-zero, then each database connection
2264	** does an initial bulk allocation for page cache memory
2265	** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
2266	** of -1024*N bytes if N is negative. ^If additional
2267	** page cache memory is needed beyond what is provided by the initial
2268	** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
2269	** additional cache line. </dd>
2270	**
2271	** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
	@@ -2290,11 +2290,11 @@
2290	**
2291	** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
2292	** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
2293	** pointer to an instance of the [sqlite3_mutex_methods] structure.
2294	** The argument specifies alternative low-level mutex routines to be used
2295	** in place of the mutex routines built into SQLite.)^ ^SQLite makes a copy of
2296	** the content of the [sqlite3_mutex_methods] structure before the call to
2297	** [sqlite3_config()] returns. ^If SQLite is compiled with
2298	** the [SQLITE_THREADSAFE \| SQLITE_THREADSAFE=0] compile-time option then
2299	** the entire mutexing subsystem is omitted from the build and hence calls to
2300	** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
	@@ -2332,11 +2332,11 @@
2332	** the interface to a custom page cache implementation.)^
2333	** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
2334	**
2335	** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
2336	** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
2337	** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies off
2338	** the current page cache implementation into that object.)^ </dd>
2339	**
2340	** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
2341	** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
2342	** global [error log].
	@@ -2349,11 +2349,11 @@
2349	** passed through as the first parameter to the application-defined logger
2350	** function whenever that function is invoked. ^The second parameter to
2351	** the logger function is a copy of the first parameter to the corresponding
2352	** [sqlite3_log()] call and is intended to be a [result code] or an
2353	** [extended result code]. ^The third parameter passed to the logger is
2354	** a log message after formatting via [sqlite3_snprintf()].
2355	** The SQLite logging interface is not reentrant; the logger function
2356	** supplied by the application must not invoke any SQLite interface.
2357	** In a multi-threaded application, the application-defined logger
2358	** function must be threadsafe. </dd>
2359	**
	@@ -2540,11 +2540,11 @@
2540	** CAPI3REF: Database Connection Configuration Options
2541	**
2542	** These constants are the available integer configuration options that
2543	** can be passed as the second parameter to the [sqlite3_db_config()] interface.
2544	**
2545	** The [sqlite3_db_config()] interface is a var-args function. It takes a
2546	** variable number of parameters, though always at least two. The number of
2547	** parameters passed into sqlite3_db_config() depends on which of these
2548	** constants is given as the second parameter. This documentation page
2549	** refers to parameters beyond the second as "arguments". Thus, when this
2550	** page says "the N-th argument" it means "the N-th parameter past the
	@@ -2674,12 +2674,12 @@
2674	** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
2675	** There must be two additional arguments.
2676	** When the first argument to this interface is 1, then only the C-API is
2677	** enabled and the SQL function remains disabled. If the first argument to
2678	** this interface is 0, then both the C-API and the SQL function are disabled.
2679	** If the first argument is -1, then no changes are made to the state of either
2680	** the C-API or the SQL function.
2681	** The second parameter is a pointer to an integer into which
2682	** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
2683	** is disabled or enabled following this call. The second parameter may
2684	** be a NULL pointer, in which case the new setting is not reported back.
2685	** </dd>
	@@ -2793,11 +2793,11 @@
2793	** </dd>
2794	**
2795	** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
2796	** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
2797	** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
2798	** the legacy behavior of the [ALTER TABLE RENAME] command such that it
2799	** behaves as it did prior to [version 3.24.0] (2018-06-04). See the
2800	** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
2801	** additional information. This feature can also be turned on and off
2802	** using the [PRAGMA legacy_alter_table] statement.
2803	** </dd>
	@@ -2842,11 +2842,11 @@
2842	**
2843	** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
2844	** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
2845	** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
2846	** the legacy file format flag. When activated, this flag causes all newly
2847	** created database files to have a schema format version number (the 4-byte
2848	** integer found at offset 44 into the database header) of 1. This in turn
2849	** means that the resulting database file will be readable and writable by
2850	** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
2851	** newly created databases are generally not understandable by SQLite versions
2852	** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
	@@ -2869,11 +2869,11 @@
2869	** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2870	** statistics. For statistics to be collected, the flag must be set on
2871	** the database handle both when the SQL statement is prepared and when it
2872	** is stepped. The flag is set (collection of statistics is enabled)
2873	** by default. <p>This option takes two arguments: an integer and a pointer to
2874	** an integer. The first argument is 1, 0, or -1 to enable, disable, or
2875	** leave unchanged the statement scanstatus option. If the second argument
2876	** is not NULL, then the value of the statement scanstatus setting after
2877	** processing the first argument is written into the integer that the second
2878	** argument points to.
2879	** </dd>
	@@ -2912,12 +2912,12 @@
2912	** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
2913	** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
2914	** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
2915	** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
2916	** This capability is enabled by default. Applications can disable or
2917	** reenable this capability using the current DBCONFIG option. If
2918	** this capability is disabled, the [ATTACH] command will still work,
2919	** but the database will be opened read-only. If this option is disabled,
2920	** then the ability to create a new database using [ATTACH] is also disabled,
2921	** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
2922	** option.<p>
2923	** This option takes two arguments which are an integer and a pointer
	@@ -2947,11 +2947,11 @@
2947	**
2948	** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
2949	**
2950	** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
2951	** overall call to [sqlite3_db_config()] has a total of four parameters.
2952	** The first argument (the third parameter to sqlite3_db_config()) is an integer.
2953	** The second argument is a pointer to an integer. If the first argument is 1,
2954	** then the option becomes enabled. If the first integer argument is 0, then the
2955	** option is disabled. If the first argument is -1, then the option setting
2956	** is unchanged. The second argument, the pointer to an integer, may be NULL.
2957	** If the second argument is not NULL, then a value of 0 or 1 is written into
	@@ -3237,11 +3237,11 @@
3237	** and comments that follow the final semicolon are ignored.
3238	**
3239	** ^These routines return 0 if the statement is incomplete. ^If a
3240	** memory allocation fails, then SQLITE_NOMEM is returned.
3241	**
3242	** ^These routines do not parse the SQL statements and thus
3243	** will not detect syntactically incorrect SQL.
3244	**
3245	** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
3246	** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
3247	** automatically by sqlite3_complete16(). If that initialization fails,
	@@ -3354,11 +3354,11 @@
3354	** Passing 0 to this function disables blocking locks altogether. Passing
3355	** -1 to this function requests that the VFS blocks for a long time -
3356	** indefinitely if possible. The results of passing any other negative value
3357	** are undefined.
3358	**
3359	** Internally, each SQLite database handle stores two timeout values - the
3360	** busy-timeout (used for rollback mode databases, or if the VFS does not
3361	** support blocking locks) and the setlk-timeout (used for blocking locks
3362	** on wal-mode databases). The sqlite3_busy_timeout() method sets both
3363	** values, this function sets only the setlk-timeout value. Therefore,
3364	** to configure separate busy-timeout and setlk-timeout values for a single
	@@ -3384,11 +3384,11 @@
3384	** METHOD: sqlite3
3385	**
3386	** This is a legacy interface that is preserved for backwards compatibility.
3387	** Use of this interface is not recommended.
3388	**
3389	** Definition: A <b>result table</b> is a memory data structure created by the
3390	** [sqlite3_get_table()] interface. A result table records the
3391	** complete query results from one or more queries.
3392	**
3393	** The table conceptually has a number of rows and columns. But
3394	** these numbers are not part of the result table itself. These
	@@ -3527,11 +3527,11 @@
3527	** of a signed 32-bit integer.
3528	**
3529	** ^Calling sqlite3_free() with a pointer previously returned
3530	** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
3531	** that it might be reused. ^The sqlite3_free() routine is
3532	** a no-op if it is called with a NULL pointer. Passing a NULL pointer
3533	** to sqlite3_free() is harmless. After being freed, memory
3534	** should neither be read nor written. Even reading previously freed
3535	** memory might result in a segmentation fault or other severe error.
3536	** Memory corruption, a segmentation fault, or other severe error
3537	** might result if sqlite3_free() is called with a non-NULL pointer that
	@@ -3545,17 +3545,17 @@
3545	** ^If the N parameter to sqlite3_realloc(X,N) is zero or
3546	** negative then the behavior is exactly the same as calling
3547	** sqlite3_free(X).
3548	** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
3549	** of at least N bytes in size or NULL if insufficient memory is available.
3550	** ^If M is the size of the prior allocation, then min(N,M) bytes of the
3551	** prior allocation are copied into the beginning of the buffer returned
3552	** by sqlite3_realloc(X,N) and the prior allocation is freed.
3553	** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
3554	** prior allocation is not freed.
3555	**
3556	** ^The sqlite3_realloc64(X,N) interface works the same as
3557	** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
3558	** of a 32-bit signed integer.
3559	**
3560	** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
3561	** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
	@@ -3601,11 +3601,11 @@
3601	** ^The [sqlite3_memory_highwater()] routine returns the maximum
3602	** value of [sqlite3_memory_used()] since the high-water mark
3603	** was last reset. ^The values returned by [sqlite3_memory_used()] and
3604	** [sqlite3_memory_highwater()] include any overhead
3605	** added by SQLite in its implementation of [sqlite3_malloc()],
3606	** but not overhead added by any underlying system library
3607	** routines that [sqlite3_malloc()] may call.
3608	**
3609	** ^The memory high-water mark is reset to the current value of
3610	** [sqlite3_memory_used()] if and only if the parameter to
3611	** [sqlite3_memory_highwater()] is true. ^The value returned
	@@ -4053,19 +4053,19 @@
4053	** attempt to use the same database connection at the same time.
4054	** (Mutexes will block any actual concurrency, but in this mode
4055	** there is no harm in trying.)
4056	**
4057	** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
4058	** <dd>The database is opened with [shared cache] enabled, overriding
4059	** the default shared cache setting provided by
4060	** [sqlite3_enable_shared_cache()].)^
4061	** The [use of shared cache mode is discouraged] and hence shared cache
4062	** capabilities may be omitted from many builds of SQLite. In such cases,
4063	** this option is a no-op.
4064	**
4065	** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
4066	** <dd>The database is opened with [shared cache] disabled, overriding
4067	** the default shared cache setting provided by
4068	** [sqlite3_enable_shared_cache()].)^
4069	**
4070	** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
4071	** <dd>The database connection comes up in "extended result code mode".
	@@ -4396,11 +4396,11 @@
4396	** These interfaces are provided for use by [VFS shim] implementations and
4397	** are not useful outside of that context.
4398	**
4399	** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
4400	** database filename D with corresponding journal file J and WAL file W and
4401	** an array P of N URI Key/Value pairs. The result from
4402	** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
4403	** is safe to pass to routines like:
4404	** <ul>
4405	** <li> [sqlite3_uri_parameter()],
4406	** <li> [sqlite3_uri_boolean()],
	@@ -4479,19 +4479,19 @@
4479	** The application does not need to worry about freeing the result.
4480	** However, the error string might be overwritten or deallocated by
4481	** subsequent calls to other SQLite interface functions.)^
4482	**
4483	** ^The sqlite3_errstr(E) interface returns the English-language text
4484	** that describes the [result code] E, as UTF-8, or NULL if E is not a
4485	** result code for which a text error message is available.
4486	** ^(Memory to hold the error message string is managed internally
4487	** and must not be freed by the application)^.
4488	**
4489	** ^If the most recent error references a specific token in the input
4490	** SQL, the sqlite3_error_offset() interface returns the byte offset
4491	** of the start of that token. ^The byte offset returned by
4492	** sqlite3_error_offset() assumes that the input SQL is UTF-8.
4493	** ^If the most recent error does not reference a specific token in the input
4494	** SQL, then the sqlite3_error_offset() function returns -1.
4495	**
4496	** When the serialized [threading mode] is in use, it might be the
4497	** case that a second error occurs on a separate thread in between
	@@ -4586,12 +4586,12 @@
4586	** CAPI3REF: Run-Time Limit Categories
4587	** KEYWORDS: {limit category} {*limit categories}
4588	**
4589	** These constants define various performance limits
4590	** that can be lowered at run-time using [sqlite3_limit()].
4591	** A concise description of these limits follows, and additional information
4592	** is available at [limits \| Limits in SQLite].
4593	**
4594	** <dl>
4595	** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
4596	** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
4597	**
	@@ -4652,11 +4652,11 @@
4652	#define SQLITE_LIMIT_WORKER_THREADS 11
4653
4654	/*
4655	** CAPI3REF: Prepare Flags
4656	**
4657	** These constants define various flags that can be passed into the
4658	** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
4659	** [sqlite3_prepare16_v3()] interfaces.
4660	**
4661	** New flags may be added in future releases of SQLite.
4662	**
	@@ -4739,11 +4739,11 @@
4739	** statement is generated.
4740	** If the caller knows that the supplied string is nul-terminated, then
4741	** there is a small performance advantage to passing an nByte parameter that
4742	** is the number of bytes in the input string <i>including</i>
4743	** the nul-terminator.
4744	** Note that nByte measures the length of the input in bytes, not
4745	** characters, even for the UTF-16 interfaces.
4746	**
4747	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
4748	** past the end of the first SQL statement in zSql. These routines only
4749	** compile the first statement in zSql, so *pzTail is left pointing to
	@@ -4873,11 +4873,11 @@
4873	** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
4874	** will return "SELECT 2345,NULL".)^
4875	**
4876	** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
4877	** is available to hold the result, or if the result would exceed the
4878	** maximum string length determined by the [SQLITE_LIMIT_LENGTH].
4879	**
4880	** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
4881	** bound parameter expansions. ^The [SQLITE_OMIT_TRACE] compile-time
4882	** option causes sqlite3_expanded_sql() to always return NULL.
4883	**
	@@ -5061,11 +5061,11 @@
5061	/*
5062	** CAPI3REF: SQL Function Context Object
5063	**
5064	** The context in which an SQL function executes is stored in an
5065	** sqlite3_context object. ^A pointer to an sqlite3_context object
5066	** is always the first parameter to [application-defined SQL functions].
5067	** The application-defined SQL function implementation will pass this
5068	** pointer through into calls to [sqlite3_result_int \| sqlite3_result()],
5069	** [sqlite3_aggregate_context()], [sqlite3_user_data()],
5070	** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
5071	** and/or [sqlite3_set_auxdata()].
	@@ -5077,11 +5077,11 @@
5077	** KEYWORDS: {host parameter} {host parameters} {host parameter name}
5078	** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
5079	** METHOD: sqlite3_stmt
5080	**
5081	** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
5082	** literals may be replaced by a [parameter] that matches one of the following
5083	** templates:
5084	**
5085	** <ul>
5086	** <li> ?
5087	** <li> ?NNN
	@@ -5122,11 +5122,11 @@
5122	** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
5123	** otherwise.
5124	**
5125	** [[byte-order determination rules]] ^The byte-order of
5126	** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
5127	** found in the first character, which is removed, or in the absence of a BOM
5128	** the byte order is the native byte order of the host
5129	** machine for sqlite3_bind_text16() or the byte order specified in
5130	** the 6th parameter for sqlite3_bind_text64().)^
5131	** ^If UTF16 input text contains invalid unicode
5132	** characters, then SQLite might change those invalid characters
	@@ -5142,11 +5142,11 @@
5142	** the behavior is undefined.
5143	** If a non-negative fourth parameter is provided to sqlite3_bind_text()
5144	** or sqlite3_bind_text16() or sqlite3_bind_text64() then
5145	** that parameter must be the byte offset
5146	** where the NUL terminator would occur assuming the string were NUL
5147	** terminated. If any NUL characters occur at byte offsets less than
5148	** the value of the fourth parameter then the resulting string value will
5149	** contain embedded NULs. The result of expressions involving strings
5150	** with embedded NULs is undefined.
5151	**
5152	** ^The fifth argument to the BLOB and string binding interfaces controls
	@@ -5354,11 +5354,11 @@
5354	/*
5355	** CAPI3REF: Source Of Data In A Query Result
5356	** METHOD: sqlite3_stmt
5357	**
5358	** ^These routines provide a means to determine the database, table, and
5359	** table column that is the origin of a particular result column in a
5360	** [SELECT] statement.
5361	** ^The name of the database or table or column can be returned as
5362	** either a UTF-8 or UTF-16 string. ^The _database_ routines return
5363	** the database name, the _table_ routines return the table name, and
5364	** the origin_ routines return the column name.
	@@ -5798,11 +5798,11 @@
5798	** CAPI3REF: Destroy A Prepared Statement Object
5799	** DESTRUCTOR: sqlite3_stmt
5800	**
5801	** ^The sqlite3_finalize() function is called to delete a [prepared statement].
5802	** ^If the most recent evaluation of the statement encountered no errors
5803	** or if the statement has never been evaluated, then sqlite3_finalize() returns
5804	** SQLITE_OK. ^If the most recent evaluation of statement S failed, then
5805	** sqlite3_finalize(S) returns the appropriate [error code] or
5806	** [extended error code].
5807	**
5808	** ^The sqlite3_finalize(S) routine can be called at any point during
	@@ -5923,12 +5923,12 @@
5923	** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
5924	** index expressions, or the WHERE clause of partial indexes.
5925	**
5926	** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
5927	** all application-defined SQL functions that do not need to be
5928	** used inside of triggers, views, CHECK constraints, or other elements of
5929	** the database schema. This flag is especially recommended for SQL
5930	** functions that have side effects or reveal internal application state.
5931	** Without this flag, an attacker might be able to modify the schema of
5932	** a database file to include invocations of the function with parameters
5933	** chosen by the attacker, which the application will then execute when
5934	** the database file is opened and read.
	@@ -5955,11 +5955,11 @@
5955	** or aggregate window function. More details regarding the implementation
5956	** of aggregate window functions are
5957	** [user-defined window functions\|available here].
5958	**
5959	** ^(If the final parameter to sqlite3_create_function_v2() or
5960	** sqlite3_create_window_function() is not NULL, then it is the destructor for
5961	** the application data pointer. The destructor is invoked when the function
5962	** is deleted, either by being overloaded or when the database connection
5963	** closes.)^ ^The destructor is also invoked if the call to
5964	** sqlite3_create_function_v2() fails. ^When the destructor callback is
5965	** invoked, it is passed a single argument which is a copy of the application
	@@ -6030,11 +6030,11 @@
6030	);
6031
6032	/*
6033	** CAPI3REF: Text Encodings
6034	**
6035	** These constants define integer codes that represent the various
6036	** text encodings supported by SQLite.
6037	*/
6038	#define SQLITE_UTF8 1 /* IMP: R-37514-35566 */
6039	#define SQLITE_UTF16LE 2 /* IMP: R-03371-37637 */
6040	#define SQLITE_UTF16BE 3 /* IMP: R-51971-34154 */
	@@ -6122,11 +6122,11 @@
6122	** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
6123	** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
6124	** result.
6125	** Every function that invokes [sqlite3_result_subtype()] should have this
6126	** property. If it does not, then the call to [sqlite3_result_subtype()]
6127	** might become a no-op if the function is used as a term in an
6128	** [expression index]. On the other hand, SQL functions that never invoke
6129	** [sqlite3_result_subtype()] should avoid setting this property, as the
6130	** purpose of this property is to disable certain optimizations that are
6131	** incompatible with subtypes.
6132	**
	@@ -6249,11 +6249,11 @@
6249	**
6250	** ^Within the [xUpdate] method of a [virtual table], the
6251	** sqlite3_value_nochange(X) interface returns true if and only if
6252	** the column corresponding to X is unchanged by the UPDATE operation
6253	** that the xUpdate method call was invoked to implement and if
6254	** the prior [xColumn] method call that was invoked to extract
6255	** the value for that column returned without setting a result (probably
6256	** because it queried [sqlite3_vtab_nochange()] and found that the column
6257	** was unchanging). ^Within an [xUpdate] method, any value for which
6258	** sqlite3_value_nochange(X) is true will in all other respects appear
6259	** to be a NULL value. If sqlite3_value_nochange(X) is invoked anywhere other
	@@ -6355,11 +6355,11 @@
6355	/*
6356	** CAPI3REF: Copy And Free SQL Values
6357	** METHOD: sqlite3_value
6358	**
6359	** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
6360	** object V and returns a pointer to that copy. ^The [sqlite3_value] returned
6361	** is a [protected sqlite3_value] object even if the input is not.
6362	** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
6363	** memory allocation fails. ^If V is a [pointer value], then the result
6364	** of sqlite3_value_dup(V) is a NULL value.
6365	**
	@@ -6393,11 +6393,11 @@
6393	** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
6394	** when first called if N is less than or equal to zero or if a memory
6395	** allocation error occurs.
6396	**
6397	** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
6398	** determined by the N parameter on the first successful call. Changing the
6399	** value of N in any subsequent call to sqlite3_aggregate_context() within
6400	** the same aggregate function instance will not resize the memory
6401	** allocation.)^ Within the xFinal callback, it is customary to set
6402	** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
6403	** pointless memory allocations occur.
	@@ -6555,11 +6555,11 @@
6555	** of as a secret key such that only code that knows the secret key is able
6556	** to access the associated data.
6557	**
6558	** Security Warning: These interfaces should not be exposed in scripting
6559	** languages or in other circumstances where it might be possible for an
6560	** attacker to invoke them. Any agent that can invoke these interfaces
6561	** can probably also take control of the process.
6562	**
6563	** Database connection client data is only available for SQLite
6564	** version 3.44.0 ([dateof:3.44.0]) and later.
6565	**
	@@ -6669,11 +6669,11 @@
6669	** ^If the 3rd parameter to the sqlite3_result_text* interfaces
6670	** is non-negative, then as many bytes (not characters) of the text
6671	** pointed to by the 2nd parameter are taken as the application-defined
6672	** function result. If the 3rd parameter is non-negative, then it
6673	** must be the byte offset into the string where the NUL terminator would
6674	** appear if the string were NUL terminated. If any NUL characters occur
6675	** in the string at a byte offset that is less than the value of the 3rd
6676	** parameter, then the resulting string will contain embedded NULs and the
6677	** result of expressions operating on strings with embedded NULs is undefined.
6678	** ^If the 4th parameter to the sqlite3_result_text* interfaces
6679	** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
	@@ -6727,11 +6727,11 @@
6727	** for the P parameter. ^SQLite invokes D with P as its only argument
6728	** when SQLite is finished with P. The T parameter should be a static
6729	** string and preferably a string literal. The sqlite3_result_pointer()
6730	** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
6731	**
6732	** If these routines are called from within a different thread
6733	** than the one containing the application-defined function that received
6734	** the [sqlite3_context] pointer, the results are undefined.
6735	*/
6736	SQLITE_API void sqlite3_result_blob(sqlite3_context, const void, int, void()(void));
6737	SQLITE_API void sqlite3_result_blob64(sqlite3_context,const void,
	@@ -7133,11 +7133,11 @@
7133	/*
7134	** CAPI3REF: Return The Schema Name For A Database Connection
7135	** METHOD: sqlite3
7136	**
7137	** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
7138	** for the N-th database on database connection D, or a NULL pointer if N is
7139	** out of range. An N value of 0 means the main database file. An N of 1 is
7140	** the "temp" schema. Larger values of N correspond to various ATTACH-ed
7141	** databases.
7142	**
7143	** Space to hold the string that is returned by sqlite3_db_name() is managed
	@@ -7228,20 +7228,20 @@
7228	**
7229	** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
7230	** <dd>The SQLITE_TXN_READ state means that the database is currently
7231	** in a read transaction. Content has been read from the database file
7232	** but nothing in the database file has changed. The transaction state
7233	** will be advanced to SQLITE_TXN_WRITE if any changes occur and there are
7234	** no other conflicting concurrent write transactions. The transaction
7235	** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
7236	** [COMMIT].</dd>
7237	**
7238	** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
7239	** <dd>The SQLITE_TXN_WRITE state means that the database is currently
7240	** in a write transaction. Content has been written to the database file
7241	** but has not yet committed. The transaction state will change to
7242	** SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
7243	*/
7244	#define SQLITE_TXN_NONE 0
7245	#define SQLITE_TXN_READ 1
7246	#define SQLITE_TXN_WRITE 2
7247
	@@ -7518,11 +7518,11 @@
7518
7519	/*
7520	** CAPI3REF: Impose A Limit On Heap Size
7521	**
7522	** These interfaces impose limits on the amount of heap memory that will be
7523	** used by all database connections within a single process.
7524	**
7525	** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
7526	** soft limit on the amount of heap memory that may be allocated by SQLite.
7527	** ^SQLite strives to keep heap memory utilization below the soft heap
7528	** limit by reducing the number of pages held in the page cache
	@@ -7576,11 +7576,11 @@
7576	** by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
7577	** from the heap.
7578	** </ul>)^
7579	**
7580	** The circumstances under which SQLite will enforce the heap limits may
7581	** change in future releases of SQLite.
7582	*/
7583	SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
7584	SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
7585
7586	/*
	@@ -7691,12 +7691,12 @@
7691	** be tried also.
7692	**
7693	** ^The entry point is zProc.
7694	** ^(zProc may be 0, in which case SQLite will try to come up with an
7695	** entry point name on its own. It first tries "sqlite3_extension_init".
7696	** If that does not work, it constructs a name "sqlite3_X_init" where
7697	** X consists of the lower-case equivalent of all ASCII alphabetic
7698	** characters in the filename from the last "/" to the first following
7699	** "." and omitting any initial "lib".)^
7700	** ^The sqlite3_load_extension() interface returns
7701	** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
7702	** ^If an error occurs and pzErrMsg is not 0, then the
	@@ -7763,11 +7763,11 @@
7763	** that is to be automatically loaded into all new database connections.
7764	**
7765	** ^(Even though the function prototype shows that xEntryPoint() takes
7766	** no arguments and returns void, SQLite invokes xEntryPoint() with three
7767	** arguments and expects an integer result as if the signature of the
7768	** entry point were as follows:
7769	**
7770	** <blockquote><pre>
7771	**   int xEntryPoint(
7772	**   sqlite3 *db,
7773	const char pzErrMsg,
	@@ -7927,11 +7927,11 @@
7927	** and becomes the argvIndex-th entry in argv. ^(If aConstraintUsage[].omit
7928	** is true, then the constraint is assumed to be fully handled by the
7929	** virtual table and might not be checked again by the byte code.)^ ^(The
7930	** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
7931	** is left in its default setting of false, the constraint will always be
7932	** checked separately in byte code. If the omit flag is changed to true, then
7933	** the constraint may or may not be checked in byte code. In other words,
7934	** when the omit flag is true there is no guarantee that the constraint will
7935	** not be checked again using byte code.)^
7936	**
7937	** ^The idxNum and idxStr values are recorded and passed into the
	@@ -7953,11 +7953,11 @@
7953	** will be returned by the strategy.
7954	**
7955	** The xBestIndex method may optionally populate the idxFlags field with a
7956	** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
7957	** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
7958	** output to show the idxNum as hex instead of as decimal. Another flag is
7959	** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
7960	** return at most one row.
7961	**
7962	** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
7963	** SQLite also assumes that if a call to the xUpdate() method is made as
	@@ -8094,11 +8094,11 @@
8094	** by the first parameter. ^The name of the module is given by the
8095	** second parameter. ^The third parameter is a pointer to
8096	** the implementation of the [virtual table module]. ^The fourth
8097	** parameter is an arbitrary client data pointer that is passed through
8098	** into the [xCreate] and [xConnect] methods of the virtual table module
8099	** when a new virtual table is being created or reinitialized.
8100	**
8101	** ^The sqlite3_create_module_v2() interface has a fifth parameter which
8102	** is a pointer to a destructor for the pClientData. ^SQLite will
8103	** invoke the destructor function (if it is not NULL) when SQLite
8104	** no longer needs the pClientData pointer. ^The destructor will also
	@@ -8259,11 +8259,11 @@
8259	**
8260	** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
8261	** in *ppBlob. Otherwise an [error code] is returned and, unless the error
8262	** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
8263	** the API is not misused, it is always safe to call [sqlite3_blob_close()]
8264	** on *ppBlob after this function returns.
8265	**
8266	** This function fails with SQLITE_ERROR if any of the following are true:
8267	** <ul>
8268	** <li> ^(Database zDb does not exist)^,
8269	** <li> ^(Table zTable does not exist within database zDb)^,
	@@ -8379,11 +8379,11 @@
8379	** CAPI3REF: Return The Size Of An Open BLOB
8380	** METHOD: sqlite3_blob
8381	**
8382	** ^Returns the size in bytes of the BLOB accessible via the
8383	** successfully opened [BLOB handle] in its only argument. ^The
8384	** incremental blob I/O routines can only read or overwrite existing
8385	** blob content; they cannot change the size of a blob.
8386	**
8387	** This routine only works on a [BLOB handle] which has been created
8388	** by a prior successful call to [sqlite3_blob_open()] and which has not
8389	** been closed by [sqlite3_blob_close()]. Passing any other pointer in
	@@ -8529,11 +8529,11 @@
8529	** function that calls sqlite3_initialize().
8530	**
8531	** ^The sqlite3_mutex_alloc() routine allocates a new
8532	** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
8533	** routine returns NULL if it is unable to allocate the requested
8534	** mutex. The argument to sqlite3_mutex_alloc() must be one of these
8535	** integer constants:
8536	**
8537	** <ul>
8538	** <li> SQLITE_MUTEX_FAST
8539	** <li> SQLITE_MUTEX_RECURSIVE
	@@ -8762,11 +8762,11 @@
8762
8763	/*
8764	** CAPI3REF: Retrieve the mutex for a database connection
8765	** METHOD: sqlite3
8766	**
8767	** ^This interface returns a pointer to the [sqlite3_mutex] object that
8768	** serializes access to the [database connection] given in the argument
8769	** when the [threading mode] is Serialized.
8770	** ^If the [threading mode] is Single-thread or Multi-thread then this
8771	** routine returns a NULL pointer.
8772	*/
	@@ -8885,11 +8885,11 @@
8885
8886	/*
8887	** CAPI3REF: SQL Keyword Checking
8888	**
8889	** These routines provide access to the set of SQL language keywords
8890	** recognized by SQLite. Applications can use these routines to determine
8891	** whether or not a specific identifier needs to be escaped (for example,
8892	** by enclosing in double-quotes) so as not to confuse the parser.
8893	**
8894	** The sqlite3_keyword_count() interface returns the number of distinct
8895	** keywords understood by SQLite.
	@@ -9053,11 +9053,11 @@
9053	**
9054	** ^The [sqlite3_str_value(X)] method returns a pointer to the current
9055	** content of the dynamic string under construction in X. The value
9056	** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
9057	** and might be freed or altered by any subsequent method on the same
9058	** [sqlite3_str] object. Applications must not use the pointer returned by
9059	** [sqlite3_str_value(X)] after any subsequent method call on the same
9060	** object. ^Applications may change the content of the string returned
9061	** by [sqlite3_str_value(X)] as long as they do not write into any bytes
9062	** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
9063	** write any byte after any subsequent sqlite3_str method call.
	@@ -9139,11 +9139,11 @@
9139	** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
9140	** <dd>This parameter returns the number of bytes of page cache
9141	** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
9142	** buffer and where forced to overflow to [sqlite3_malloc()]. The
9143	** returned value includes allocations that overflowed because they
9144	** were too large (they were larger than the "sz" parameter to
9145	** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
9146	** no space was left in the page cache.</dd>)^
9147	**
9148	** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
9149	** <dd>This parameter records the largest memory allocation request
	@@ -9223,53 +9223,55 @@
9223	** checked out.</dd>)^
9224	**
9225	** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
9226	** <dd>This parameter returns the number of malloc attempts that were
9227	** satisfied using lookaside memory. Only the high-water value is meaningful;
9228	** the current value is always zero.</dd>)^
9229	**
9230	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
9231	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
9232	** <dd>This parameter returns the number of malloc attempts that might have
9233	** been satisfied using lookaside memory but failed due to the amount of
9234	** memory requested being larger than the lookaside slot size.
9235	** Only the high-water value is meaningful;
9236	** the current value is always zero.</dd>)^
9237	**
9238	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
9239	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
9240	** <dd>This parameter returns the number of malloc attempts that might have
9241	** been satisfied using lookaside memory but failed due to all lookaside
9242	** memory already being in use.
9243	** Only the high-water value is meaningful;
9244	** the current value is always zero.</dd>)^
9245	**
9246	** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
9247	** <dd>This parameter returns the approximate number of bytes of heap
9248	** memory used by all pager caches associated with the database connection.)^
9249	** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
9250	** </dd>
9251	**
9252	** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
9253	** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
9254	** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
9255	** pager cache is shared between two or more connections the bytes of heap
9256	** memory used by that pager cache is divided evenly between the attached
9257	** connections.)^ In other words, if none of the pager caches associated
9258	** with the database connection are shared, this request returns the same
9259	** value as DBSTATUS_CACHE_USED. Or, if one or more of the pager caches are
9260	** shared, the value returned by this call will be smaller than that returned
9261	** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
9262	** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.</dd>
9263	**
9264	** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
9265	** <dd>This parameter returns the approximate number of bytes of heap
9266	** memory used to store the schema for all databases associated
9267	** with the connection - main, temp, and any [ATTACH]-ed databases.)^
9268	** ^The full amount of memory used by the schemas is reported, even if the
9269	** schema memory is shared with other database connections due to
9270	** [shared cache mode] being enabled.
9271	** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
9272	** </dd>
9273	**
9274	** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
9275	** <dd>This parameter returns the approximate number of bytes of heap
9276	** and lookaside memory used by all prepared statements associated with
9277	** the database connection.)^
	@@ -9302,11 +9304,11 @@
9304	** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
9305	** <dd>This parameter returns the number of dirty cache entries that have
9306	** been written to disk in the middle of a transaction due to the page
9307	** cache overflowing. Transactions are more efficient if they are written
9308	** to disk all at once. When pages spill mid-transaction, that introduces
9309	** additional overhead. This parameter can be used to help identify
9310	** inefficiencies that can be resolved by increasing the cache size.
9311	** </dd>
9312	**
9313	** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
9314	** <dd>This parameter returns zero for the current value if and only if
	@@ -9373,48 +9375,48 @@
9375	** careful use of indices.</dd>
9376	**
9377	** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
9378	** <dd>^This is the number of sort operations that have occurred.
9379	** A non-zero value in this counter may indicate an opportunity to
9380	** improve performance through careful use of indices.</dd>
9381	**
9382	** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
9383	** <dd>^This is the number of rows inserted into transient indices that
9384	** were created automatically in order to help joins run faster.
9385	** A non-zero value in this counter may indicate an opportunity to
9386	** improve performance by adding permanent indices that do not
9387	** need to be reinitialized each time the statement is run.</dd>
9388	**
9389	** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
9390	** <dd>^This is the number of virtual machine operations executed
9391	** by the prepared statement if that number is less than or equal
9392	** to 2147483647. The number of virtual machine operations can be
9393	** used as a proxy for the total work done by the prepared statement.
9394	** If the number of virtual machine operations exceeds 2147483647
9395	** then the value returned by this statement status code is undefined.</dd>
9396	**
9397	** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
9398	** <dd>^This is the number of times that the prepare statement has been
9399	** automatically regenerated due to schema changes or changes to
9400	** [bound parameters] that might affect the query plan.</dd>
9401	**
9402	** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
9403	** <dd>^This is the number of times that the prepared statement has
9404	** been run. A single "run" for the purposes of this counter is one
9405	** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
9406	** The counter is incremented on the first [sqlite3_step()] call of each
9407	** cycle.</dd>
9408	**
9409	** [[SQLITE_STMTSTATUS_FILTER_MISS]]
9410	** [[SQLITE_STMTSTATUS_FILTER HIT]]
9411	** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
9412	** SQLITE_STMTSTATUS_FILTER_MISS</dt>
9413	** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
9414	** step was bypassed because a Bloom filter returned not-found. The
9415	** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
9416	** times that the Bloom filter returned a find, and thus the join step
9417	** had to be processed as normal.</dd>
9418	**
9419	** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
9420	** <dd>^This is the approximate number of bytes of heap memory
9421	** used to store the prepared statement. ^This value is not actually
9422	** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
	@@ -9515,31 +9517,31 @@
9517	** [[the xCreate() page cache methods]]
9518	** ^SQLite invokes the xCreate() method to construct a new cache instance.
9519	** SQLite will typically create one cache instance for each open database file,
9520	** though this is not guaranteed. ^The
9521	** first parameter, szPage, is the size in bytes of the pages that must
9522	** be allocated by the cache. ^szPage will always be a power of two. ^The
9523	** second parameter szExtra is a number of bytes of extra storage
9524	** associated with each page cache entry. ^The szExtra parameter will be
9525	** a number less than 250. SQLite will use the
9526	** extra szExtra bytes on each page to store metadata about the underlying
9527	** database page on disk. The value passed into szExtra depends
9528	** on the SQLite version, the target platform, and how SQLite was compiled.
9529	** ^The third argument to xCreate(), bPurgeable, is true if the cache being
9530	** created will be used to cache database pages of a file stored on disk, or
9531	** false if it is used for an in-memory database. The cache implementation
9532	** does not have to do anything special based upon the value of bPurgeable;
9533	** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
9534	** never invoke xUnpin() except to deliberately delete a page.
9535	** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
9536	** false will always have the "discard" flag set to true.
9537	** ^Hence, a cache created with bPurgeable set to false will
9538	** never contain any unpinned pages.
9539	**
9540	** [[the xCachesize() page cache method]]
9541	** ^(The xCachesize() method may be called at any time by SQLite to set the
9542	** suggested maximum cache-size (number of pages stored) for the cache
9543	** instance passed as the first argument. This is the value configured using
9544	** the SQLite "[PRAGMA cache_size]" command.)^ As with the bPurgeable
9545	** parameter, the implementation is not required to do anything with this
9546	** value; it is advisory only.
9547	**
	@@ -9562,16 +9564,16 @@
9564	**
9565	** If the requested page is already in the page cache, then the page cache
9566	** implementation must return a pointer to the page buffer with its content
9567	** intact. If the requested page is not already in the cache, then the
9568	** cache implementation should use the value of the createFlag
9569	** parameter to help it determine what action to take:
9570	**
9571	** <table border=1 width=85% align=center>
9572	** <tr><th> createFlag <th> Behavior when page is not already in cache
9573	** <tr><td> 0 <td> Do not allocate a new page. Return NULL.
9574	** <tr><td> 1 <td> Allocate a new page if it is easy and convenient to do so.
9575	** Otherwise return NULL.
9576	** <tr><td> 2 <td> Make every effort to allocate a new page. Only return
9577	** NULL if allocating a new page is effectively impossible.
9578	** </table>
9579	**
	@@ -9584,11 +9586,11 @@
9586	** [[the xUnpin() page cache method]]
9587	** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
9588	** as its second argument. If the third parameter, discard, is non-zero,
9589	** then the page must be evicted from the cache.
9590	** ^If the discard parameter is
9591	** zero, then the page may be discarded or retained at the discretion of the
9592	** page cache implementation. ^The page cache implementation
9593	** may choose to evict unpinned pages at any time.
9594	**
9595	** The cache must not perform any reference counting. A single
9596	** call to xUnpin() unpins the page regardless of the number of prior calls
	@@ -9602,11 +9604,11 @@
9604	** to be pinned.
9605	**
9606	** When SQLite calls the xTruncate() method, the cache must discard all
9607	** existing cache entries with page numbers (keys) greater than or equal
9608	** to the value of the iLimit parameter passed to xTruncate(). If any
9609	** of these pages are pinned, they become implicitly unpinned, meaning that
9610	** they can be safely discarded.
9611	**
9612	** [[the xDestroy() page cache method]]
9613	** ^The xDestroy() method is used to delete a cache allocated by xCreate().
9614	** All resources associated with the specified cache should be freed. ^After
	@@ -9782,11 +9784,11 @@
9784	** sqlite3_backup_step(), the source database may be modified mid-way
9785	** through the backup process. ^If the source database is modified by an
9786	** external process or via a database connection other than the one being
9787	** used by the backup operation, then the backup will be automatically
9788	** restarted by the next call to sqlite3_backup_step(). ^If the source
9789	** database is modified by using the same database connection as is used
9790	** by the backup operation, then the backup database is automatically
9791	** updated at the same time.
9792	**
9793	** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
9794	**
	@@ -9799,11 +9801,11 @@
9801	** active write-transaction on the destination database is rolled back.
9802	** The [sqlite3_backup] object is invalid
9803	** and may not be used following a call to sqlite3_backup_finish().
9804	**
9805	** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
9806	** sqlite3_backup_step() errors occurred, regardless of whether or not
9807	** sqlite3_backup_step() completed.
9808	** ^If an out-of-memory condition or IO error occurred during any prior
9809	** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
9810	** sqlite3_backup_finish() returns the corresponding [error code].
9811	**
	@@ -9901,11 +9903,11 @@
9903	** identity of the database connection (the blocking connection) that
9904	** has locked the required resource is stored internally. ^After an
9905	** application receives an SQLITE_LOCKED error, it may call the
9906	** sqlite3_unlock_notify() method with the blocked connection handle as
9907	** the first argument to register for a callback that will be invoked
9908	** when the blocking connection's current transaction is concluded. ^The
9909	** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
9910	** call that concludes the blocking connection's transaction.
9911	**
9912	** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
9913	** there is a chance that the blocking connection will have already
	@@ -9921,11 +9923,11 @@
9923	** ^(There may be at most one unlock-notify callback registered by a
9924	** blocked connection. If sqlite3_unlock_notify() is called when the
9925	** blocked connection already has a registered unlock-notify callback,
9926	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
9927	** called with a NULL pointer as its second argument, then any existing
9928	** unlock-notify callback is canceled. ^The blocked connection's
9929	** unlock-notify callback may also be canceled by closing the blocked
9930	** connection using [sqlite3_close()].
9931	**
9932	** The unlock-notify callback is not reentrant. If an application invokes
9933	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -10319,11 +10321,11 @@
10321	** where X is an integer. If X is zero, then the [virtual table] whose
10322	** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
10323	** support constraints. In this configuration (which is the default) if
10324	** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
10325	** statement is rolled back as if [ON CONFLICT \| OR ABORT] had been
10326	** specified as part of the user's SQL statement, regardless of the actual
10327	** ON CONFLICT mode specified.
10328	**
10329	** If X is non-zero, then the virtual table implementation guarantees
10330	** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
10331	** any modifications to internal or persistent data structures have been made.
	@@ -10353,11 +10355,11 @@
10355	** </dd>
10356	**
10357	** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
10358	** <dd>Calls of the form
10359	** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
10360	** [xConnect] or [xCreate] methods of a [virtual table] implementation
10361	** identify that virtual table as being safe to use from within triggers
10362	** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
10363	** virtual table can do no serious harm even if it is controlled by a
10364	** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
10365	** flag unless absolutely necessary.
	@@ -10521,21 +10523,21 @@
10523	** <tr><td>2<td>no<td>yes<td>yes
10524	** <tr><td>3<td>yes<td>yes<td>yes
10525	** </table>
10526	**
10527	** ^For the purposes of comparing virtual table output values to see if the
10528	** values are the same value for sorting purposes, two NULL values are considered
10529	** to be the same. In other words, the comparison operator is "IS"
10530	** (or "IS NOT DISTINCT FROM") and not "==".
10531	**
10532	** If a virtual table implementation is unable to meet the requirements
10533	** specified above, then it must not set the "orderByConsumed" flag in the
10534	** [sqlite3_index_info] object or an incorrect answer may result.
10535	**
10536	** ^A virtual table implementation is always free to return rows in any order
10537	** it wants, as long as the "orderByConsumed" flag is not set. ^When the
10538	** "orderByConsumed" flag is unset, the query planner will add extra
10539	** [bytecode] to ensure that the final results returned by the SQL query are
10540	** ordered correctly. The use of the "orderByConsumed" flag and the
10541	** sqlite3_vtab_distinct() interface is merely an optimization. ^Careful
10542	** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
10543	** flag might help queries against a virtual table to run faster. Being
	@@ -10628,11 +10630,11 @@
10630	**
10631	** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
10632	** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
10633	** xFilter method which invokes these routines, and specifically
10634	** a parameter that was previously selected for all-at-once IN constraint
10635	** processing using the [sqlite3_vtab_in()] interface in the
10636	** [xBestIndex\|xBestIndex method]. ^(If the X parameter is not
10637	** an xFilter argument that was selected for all-at-once IN constraint
10638	** processing, then these routines return [SQLITE_ERROR].)^
10639	**
10640	** ^(Use these routines to access all values on the right-hand side
	@@ -10683,11 +10685,11 @@
10685	** right-hand operand is not known, then *V is set to a NULL pointer.
10686	** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
10687	** and only if *V is set to a value. ^The sqlite3_vtab_rhs_value(P,J,V)
10688	** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
10689	** constraint is not available. ^The sqlite3_vtab_rhs_value() interface
10690	** can return a result code other than SQLITE_OK or SQLITE_NOTFOUND if
10691	** something goes wrong.
10692	**
10693	** The sqlite3_vtab_rhs_value() interface is usually only successful if
10694	** the right-hand operand of a constraint is a literal value in the original
10695	** SQL statement. If the right-hand operand is an expression or a reference
	@@ -10711,12 +10713,12 @@
10713	/*
10714	** CAPI3REF: Conflict resolution modes
10715	** KEYWORDS: {conflict resolution mode}
10716	**
10717	** These constants are returned by [sqlite3_vtab_on_conflict()] to
10718	** inform a [virtual table] implementation of the [ON CONFLICT] mode
10719	** for the SQL statement being evaluated.
10720	**
10721	** Note that the [SQLITE_IGNORE] constant is also used as a potential
10722	** return value from the [sqlite3_set_authorizer()] callback and that
10723	** [SQLITE_ABORT] is also a [result code].
10724	*/
	@@ -10752,43 +10754,43 @@
10754	** to the total number of rows examined by all iterations of the X-th loop.</dd>
10755	**
10756	** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
10757	** <dd>^The "double" variable pointed to by the V parameter will be set to the
10758	** query planner's estimate for the average number of rows output from each
10759	** iteration of the X-th loop. If the query planner's estimate was accurate,
10760	** then this value will approximate the quotient NVISIT/NLOOP and the
10761	** product of this value for all prior loops with the same SELECTID will
10762	** be the NLOOP value for the current loop.</dd>
10763	**
10764	** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
10765	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10766	** to a zero-terminated UTF-8 string containing the name of the index or table
10767	** used for the X-th loop.</dd>
10768	**
10769	** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
10770	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10771	** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
10772	** description for the X-th loop.</dd>
10773	**
10774	** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
10775	** <dd>^The "int" variable pointed to by the V parameter will be set to the
10776	** id for the X-th query plan element. The id value is unique within the
10777	** statement. The select-id is the same value as is output in the first
10778	** column of an [EXPLAIN QUERY PLAN] query.</dd>
10779	**
10780	** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
10781	** <dd>The "int" variable pointed to by the V parameter will be set to the
10782	** id of the parent of the current query element, if applicable, or
10783	** to zero if the query element has no parent. This is the same value as
10784	** returned in the second column of an [EXPLAIN QUERY PLAN] query.</dd>
10785	**
10786	** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
10787	** <dd>The sqlite3_int64 output value is set to the number of cycles,
10788	** according to the processor time-stamp counter, that elapsed while the
10789	** query element was being processed. This value is not available for
10790	** all query elements - if it is unavailable the output variable is
10791	** set to -1.</dd>
10792	** </dl>
10793	*/
10794	#define SQLITE_SCANSTAT_NLOOP 0
10795	#define SQLITE_SCANSTAT_NVISIT 1
10796	#define SQLITE_SCANSTAT_EST 2
	@@ -10825,12 +10827,12 @@
10827	** the EXPLAIN QUERY PLAN output) are available. Invoking API
10828	** sqlite3_stmt_scanstatus() is equivalent to calling
10829	** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
10830	**
10831	** Parameter "idx" identifies the specific query element to retrieve statistics
10832	** for. Query elements are numbered starting from zero. A value of -1 may
10833	** retrieve statistics for the entire query. ^If idx is out of range
10834	** - less than -1 or greater than or equal to the total number of query
10835	** elements used to implement the statement - a non-zero value is returned and
10836	** the variable that pOut points to is unchanged.
10837	**
10838	** See also: [sqlite3_stmt_scanstatus_reset()]
	@@ -10869,11 +10871,11 @@
10871	/*
10872	** CAPI3REF: Flush caches to disk mid-transaction
10873	** METHOD: sqlite3
10874	**
10875	** ^If a write-transaction is open on [database connection] D when the
10876	** [sqlite3_db_cacheflush(D)] interface is invoked, any dirty
10877	** pages in the pager-cache that are not currently in use are written out
10878	** to disk. A dirty page may be in use if a database cursor created by an
10879	** active SQL statement is reading from it, or if it is page 1 of a database
10880	** file (page 1 is always "in use"). ^The [sqlite3_db_cacheflush(D)]
10881	** interface flushes caches for all schemas - "main", "temp", and
	@@ -10983,12 +10985,12 @@
10985	** operation; or 1 for inserts, updates, or deletes invoked by top-level
10986	** triggers; or 2 for changes resulting from triggers called by top-level
10987	** triggers; and so forth.
10988	**
10989	** When the [sqlite3_blob_write()] API is used to update a blob column,
10990	** the pre-update hook is invoked with SQLITE_DELETE, because
10991	** the new values are not yet available. In this case, when a
10992	** callback made with op==SQLITE_DELETE is actually a write using the
10993	** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
10994	** the index of the column being written. In other cases, where the
10995	** pre-update hook is being invoked for some other reason, including a
10996	** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
	@@ -11237,20 +11239,20 @@
11239	** is written into *P.
11240	**
11241	** For an ordinary on-disk database file, the serialization is just a
11242	** copy of the disk file. For an in-memory database or a "TEMP" database,
11243	** the serialization is the same sequence of bytes which would be written
11244	** to disk if that database were backed up to disk.
11245	**
11246	** The usual case is that sqlite3_serialize() copies the serialization of
11247	** the database into memory obtained from [sqlite3_malloc64()] and returns
11248	** a pointer to that memory. The caller is responsible for freeing the
11249	** returned value to avoid a memory leak. However, if the F argument
11250	** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
11251	** are made, and the sqlite3_serialize() function will return a pointer
11252	** to the contiguous memory representation of the database that SQLite
11253	** is currently using for that database, or NULL if no such contiguous
11254	** memory representation of the database exists. A contiguous memory
11255	** representation of the database will usually only exist if there has
11256	** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
11257	** values of D and S.
11258	** The size of the database is written into *P even if the
	@@ -11317,11 +11319,11 @@
11319	**
11320	** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
11321	** database is currently in a read transaction or is involved in a backup
11322	** operation.
11323	**
11324	** It is not possible to deserialize into the TEMP database. If the
11325	** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
11326	** function returns SQLITE_ERROR.
11327	**
11328	** The deserialized database should not be in [WAL mode]. If the database
11329	** is in WAL mode, then any attempt to use the database file will result
	@@ -11339,19 +11341,19 @@
11341	*/
11342	SQLITE_API int sqlite3_deserialize(
11343	sqlite3 db, / The database connection */
11344	const char zSchema, / Which DB to reopen with the deserialization */
11345	unsigned char pData, / The serialized database content */
11346	sqlite3_int64 szDb, /* Number of bytes in the deserialization */
11347	sqlite3_int64 szBuf, /* Total size of buffer pData[] */
11348	unsigned mFlags /* Zero or more SQLITE_DESERIALIZE_* flags */
11349	);
11350
11351	/*
11352	** CAPI3REF: Flags for sqlite3_deserialize()
11353	**
11354	** The following are allowed values for the 6th argument (the F argument) to
11355	** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
11356	**
11357	** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
11358	** in the P argument is held in memory obtained from [sqlite3_malloc64()]
11359	** and that SQLite should take ownership of this memory and automatically
	@@ -11872,13 +11874,14 @@
11874	** This may appear to have some counter-intuitive effects if a single row
11875	** is written to more than once during a session. For example, if a row
11876	** is inserted while a session object is enabled, then later deleted while
11877	** the same session object is disabled, no INSERT record will appear in the
11878	** changeset, even though the delete took place while the session was disabled.
11879	** Or, if one field of a row is updated while a session is enabled, and
11880	** then another field of the same row is updated while the session is disabled,
11881	** the resulting changeset will contain an UPDATE change that updates both
11882	** fields.
11883	*/
11884	SQLITE_API int sqlite3session_changeset(
11885	sqlite3_session pSession, / Session object */
11886	int pnChangeset, / OUT: Size of buffer at ppChangeset /
11887	void *ppChangeset / OUT: Buffer containing changeset */
	@@ -12083,11 +12086,11 @@
12086	** CAPI3REF: Flags for sqlite3changeset_start_v2
12087	**
12088	** The following flags may passed via the 4th parameter to
12089	** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
12090	**
12091	** <dt>SQLITE_CHANGESETSTART_INVERT <dd>
12092	** Invert the changeset while iterating through it. This is equivalent to
12093	** inverting a changeset using sqlite3changeset_invert() before applying it.
12094	** It is an error to specify this flag with a patchset.
12095	*/
12096	#define SQLITE_CHANGESETSTART_INVERT 0x0002
	@@ -12628,17 +12631,26 @@
12631	** Apply a changeset or patchset to a database. These functions attempt to
12632	** update the "main" database attached to handle db with the changes found in
12633	** the changeset passed via the second and third arguments.
12634	**
12635	** The fourth argument (xFilter) passed to these functions is the "filter
12636	** callback". This may be passed NULL, in which case all changes in the
12637	** changeset are applied to the database. For sqlite3changeset_apply() and
12638	** sqlite3_changeset_apply_v2(), if it is not NULL, then it is invoked once
12639	** for each table affected by at least one change in the changeset. In this
12640	** case the table name is passed as the second argument, and a copy of
12641	** the context pointer passed as the sixth argument to apply() or apply_v2()
12642	** as the first. If the "filter callback" returns zero, then no attempt is
12643	** made to apply any changes to the table. Otherwise, if the return value is
12644	** non-zero, all changes related to the table are attempted.
12645	**
12646	** For sqlite3_changeset_apply_v3(), the xFilter callback is invoked once
12647	** per change. The second argument in this case is an sqlite3_changeset_iter
12648	** that may be queried using the usual APIs for the details of the current
12649	** change. If the "filter callback" returns zero in this case, then no attempt
12650	** is made to apply the current change. If it returns non-zero, the change
12651	** is applied.
12652	**
12653	** For each table that is not excluded by the filter callback, this function
12654	** tests that the target database contains a compatible table. A table is
12655	** considered compatible if all of the following are true:
12656	**
	@@ -12655,15 +12667,15 @@
12667	** changes associated with the table are applied. A warning message is issued
12668	** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
12669	** one such warning is issued for each table in the changeset.
12670	**
12671	** For each change for which there is a compatible table, an attempt is made
12672	** to modify the table contents according to each UPDATE, INSERT or DELETE
12673	** change that is not excluded by a filter callback. If a change cannot be
12674	** applied cleanly, the conflict handler function passed as the fifth argument
12675	** to sqlite3changeset_apply() may be invoked. A description of exactly when
12676	** the conflict handler is invoked for each type of change is below.
12677	**
12678	** Unlike the xFilter argument, xConflict may not be passed NULL. The results
12679	** of passing anything other than a valid function pointer as the xConflict
12680	** argument are undefined.
12681	**
	@@ -12801,10 +12813,27 @@
12813	void pChangeset, / Changeset blob */
12814	int(*xFilter)(
12815	void pCtx, / Copy of sixth arg to _apply() */
12816	const char zTab / Table name */
12817	),
12818	int(*xConflict)(
12819	void pCtx, / Copy of sixth arg to _apply() */
12820	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12821	sqlite3_changeset_iter p / Handle describing change and conflict */
12822	),
12823	void pCtx, / First argument passed to xConflict */
12824	void *ppRebase, int pnRebase, /* OUT: Rebase data */
12825	int flags /* SESSION_CHANGESETAPPLY_* flags */
12826	);
12827	SQLITE_API int sqlite3changeset_apply_v3(
12828	sqlite3 db, / Apply change to "main" db of this handle */
12829	int nChangeset, /* Size of changeset in bytes */
12830	void pChangeset, / Changeset blob */
12831	int(*xFilter)(
12832	void pCtx, / Copy of sixth arg to _apply() */
12833	sqlite3_changeset_iter p / Handle describing change */
12834	),
12835	int(*xConflict)(
12836	void pCtx, / Copy of sixth arg to _apply() */
12837	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12838	sqlite3_changeset_iter p / Handle describing change and conflict */
12839	),
	@@ -13220,10 +13249,27 @@
13249	void pIn, / First arg for xInput */
13250	int(*xFilter)(
13251	void pCtx, / Copy of sixth arg to _apply() */
13252	const char zTab / Table name */
13253	),
13254	int(*xConflict)(
13255	void pCtx, / Copy of sixth arg to _apply() */
13256	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
13257	sqlite3_changeset_iter p / Handle describing change and conflict */
13258	),
13259	void pCtx, / First argument passed to xConflict */
13260	void *ppRebase, int pnRebase,
13261	int flags
13262	);
13263	SQLITE_API int sqlite3changeset_apply_v3_strm(
13264	sqlite3 db, / Apply change to "main" db of this handle */
13265	int (xInput)(void pIn, void pData, int pnData), /* Input function */
13266	void pIn, / First arg for xInput */
13267	int(*xFilter)(
13268	void pCtx, / Copy of sixth arg to _apply() */
13269	sqlite3_changeset_iter *p
13270	),
13271	int(*xConflict)(
13272	void pCtx, / Copy of sixth arg to _apply() */
13273	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
13274	sqlite3_changeset_iter p / Handle describing change and conflict */
13275	),
	@@ -15173,11 +15219,11 @@
15219	/*
15220	** GCC does not define the offsetof() macro so we'll have to do it
15221	** ourselves.
15222	*/
15223	#ifndef offsetof
15224	# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
15225	#endif
15226
15227	/*
15228	** Work around C99 "flex-array" syntax for pre-C99 compilers, so as
15229	** to avoid complaints from -fsanitize=strict-bounds.
	@@ -15439,12 +15485,12 @@
15485	/*
15486	** Macro SMXV(n) return the maximum value that can be held in variable n,
15487	** assuming n is a signed integer type. UMXV(n) is similar for unsigned
15488	** integer types.
15489	*/
15490	#define SMXV(n) ((((i64)1)<<(sizeof(n)*8-1))-1)
15491	#define UMXV(n) ((((i64)1)<<(sizeof(n)*8))-1)
15492
15493	/*
15494	** Round up a number to the next larger multiple of 8. This is used
15495	** to force 8-byte alignment on 64-bit architectures.
15496	**
	@@ -15561,10 +15607,12 @@
15607	** 0x00008000 After all FROM-clause analysis
15608	** 0x00010000 Beginning of DELETE/INSERT/UPDATE processing
15609	** 0x00020000 Transform DISTINCT into GROUP BY
15610	** 0x00040000 SELECT tree dump after all code has been generated
15611	** 0x00080000 NOT NULL strength reduction
15612	** 0x00100000 Pointers are all shown as zero
15613	** 0x00200000 EXISTS-to-JOIN optimization
15614	*/
15615
15616	/*
15617	** Macros for "wheretrace"
15618	*/
	@@ -15605,10 +15653,11 @@
15653	**
15654	** 0x00010000 Show more detail when printing WHERE terms
15655	** 0x00020000 Show WHERE terms returned from whereScanNext()
15656	** 0x00040000 Solver overview messages
15657	** 0x00080000 Star-query heuristic
15658	** 0x00100000 Pointers are all shown as zero
15659	*/
15660
15661
15662	/*
15663	** An instance of the following structure is used to store the busy-handler
	@@ -15677,11 +15726,11 @@
15726	** one parameter that destructors normally want. So we have to introduce
15727	** this magic value that the code knows to handle differently. Any
15728	** pointer will work here as long as it is distinct from SQLITE_STATIC
15729	** and SQLITE_TRANSIENT.
15730	*/
15731	#define SQLITE_DYNAMIC ((sqlite3_destructor_type)sqlite3RowSetClear)
15732
15733	/*
15734	** When SQLITE_OMIT_WSD is defined, it means that the target platform does
15735	** not support Writable Static Data (WSD) such as global and static variables.
15736	** All variables must either be on the stack or dynamically allocated from
	@@ -16745,10 +16794,11 @@
16794	};
16795
16796	SQLITE_PRIVATE int sqlite3BtreeInsert(BtCursor, const BtreePayload pPayload,
16797	int flags, int seekResult);
16798	SQLITE_PRIVATE int sqlite3BtreeFirst(BtCursor, int pRes);
16799	SQLITE_PRIVATE int sqlite3BtreeIsEmpty(BtCursor pCur, int pRes);
16800	SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor, int pRes);
16801	SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor*, int flags);
16802	SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor*);
16803	SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int flags);
16804	SQLITE_PRIVATE i64 sqlite3BtreeIntegerKey(BtCursor*);
	@@ -17078,76 +17128,76 @@
17128	#define OP_Last 32 /* jump0 */
17129	#define OP_IfSizeBetween 33 /* jump */
17130	#define OP_SorterSort 34 /* jump */
17131	#define OP_Sort 35 /* jump */
17132	#define OP_Rewind 36 /* jump0 */
17133	#define OP_IfEmpty 37 /* jump, synopsis: if( empty(P1) ) goto P2 */
17134	#define OP_SorterNext 38 /* jump */
17135	#define OP_Prev 39 /* jump */
17136	#define OP_Next 40 /* jump */
17137	#define OP_IdxLE 41 /* jump, synopsis: key=r[P3@P4] */
17138	#define OP_IdxGT 42 /* jump, synopsis: key=r[P3@P4] */
17139	#define OP_Or 43 /* same as TK_OR, synopsis: r[P3]=(r[P1] \|\| r[P2]) */
17140	#define OP_And 44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
17141	#define OP_IdxLT 45 /* jump, synopsis: key=r[P3@P4] */
17142	#define OP_IdxGE 46 /* jump, synopsis: key=r[P3@P4] */
17143	#define OP_RowSetRead 47 /* jump, synopsis: r[P3]=rowset(P1) */
17144	#define OP_RowSetTest 48 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
17145	#define OP_Program 49 /* jump0 */
17146	#define OP_FkIfZero 50 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
17147	#define OP_IsNull 51 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
17148	#define OP_NotNull 52 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
17149	#define OP_Ne 53 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
17150	#define OP_Eq 54 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
17151	#define OP_Gt 55 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
17152	#define OP_Le 56 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
17153	#define OP_Lt 57 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
17154	#define OP_Ge 58 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
17155	#define OP_ElseEq 59 /* jump, same as TK_ESCAPE */
17156	#define OP_IfPos 60 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
17157	#define OP_IfNotZero 61 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
17158	#define OP_DecrJumpZero 62 /* jump, synopsis: if (--r[P1])==0 goto P2 */
17159	#define OP_IncrVacuum 63 /* jump */
17160	#define OP_VNext 64 /* jump */
17161	#define OP_Filter 65 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
17162	#define OP_PureFunc 66 /* synopsis: r[P3]=func(r[P2@NP]) */
17163	#define OP_Function 67 /* synopsis: r[P3]=func(r[P2@NP]) */
17164	#define OP_Return 68
17165	#define OP_EndCoroutine 69
17166	#define OP_HaltIfNull 70 /* synopsis: if r[P3]=null halt */
17167	#define OP_Halt 71
17168	#define OP_Integer 72 /* synopsis: r[P2]=P1 */
17169	#define OP_Int64 73 /* synopsis: r[P2]=P4 */
17170	#define OP_String 74 /* synopsis: r[P2]='P4' (len=P1) */
17171	#define OP_BeginSubrtn 75 /* synopsis: r[P2]=NULL */
17172	#define OP_Null 76 /* synopsis: r[P2..P3]=NULL */
17173	#define OP_SoftNull 77 /* synopsis: r[P1]=NULL */
17174	#define OP_Blob 78 /* synopsis: r[P2]=P4 (len=P1) */
17175	#define OP_Variable 79 /* synopsis: r[P2]=parameter(P1) */
17176	#define OP_Move 80 /* synopsis: r[P2@P3]=r[P1@P3] */
17177	#define OP_Copy 81 /* synopsis: r[P2@P3+1]=r[P1@P3+1] */
17178	#define OP_SCopy 82 /* synopsis: r[P2]=r[P1] */
17179	#define OP_IntCopy 83 /* synopsis: r[P2]=r[P1] */
17180	#define OP_FkCheck 84
17181	#define OP_ResultRow 85 /* synopsis: output=r[P1@P2] */
17182	#define OP_CollSeq 86
17183	#define OP_AddImm 87 /* synopsis: r[P1]=r[P1]+P2 */
17184	#define OP_RealAffinity 88
17185	#define OP_Cast 89 /* synopsis: affinity(r[P1]) */
17186	#define OP_Permutation 90
17187	#define OP_Compare 91 /* synopsis: r[P1@P3] <-> r[P2@P3] */
17188	#define OP_IsTrue 92 /* synopsis: r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4 */
17189	#define OP_ZeroOrNull 93 /* synopsis: r[P2] = 0 OR NULL */
17190	#define OP_Offset 94 /* synopsis: r[P3] = sqlite_offset(P1) */
17191	#define OP_Column 95 /* synopsis: r[P3]=PX cursor P1 column P2 */
17192	#define OP_TypeCheck 96 /* synopsis: typecheck(r[P1@P2]) */
17193	#define OP_Affinity 97 /* synopsis: affinity(r[P1@P2]) */
17194	#define OP_MakeRecord 98 /* synopsis: r[P3]=mkrec(r[P1@P2]) */
17195	#define OP_Count 99 /* synopsis: r[P2]=count() */
17196	#define OP_ReadCookie 100
17197	#define OP_SetCookie 101
17198	#define OP_ReopenIdx 102 /* synopsis: root=P2 iDb=P3 */
17199	#define OP_BitAnd 103 /* same as TK_BITAND, synopsis: r[P3]=r[P1]&r[P2] */
17200	#define OP_BitOr 104 /* same as TK_BITOR, synopsis: r[P3]=r[P1]\|r[P2] */
17201	#define OP_ShiftLeft 105 /* same as TK_LSHIFT, synopsis: r[P3]=r[P2]<<r[P1] */
17202	#define OP_ShiftRight 106 /* same as TK_RSHIFT, synopsis: r[P3]=r[P2]>>r[P1] */
17203	#define OP_Add 107 /* same as TK_PLUS, synopsis: r[P3]=r[P1]+r[P2] */
	@@ -17154,87 +17204,88 @@
17204	#define OP_Subtract 108 /* same as TK_MINUS, synopsis: r[P3]=r[P2]-r[P1] */
17205	#define OP_Multiply 109 /* same as TK_STAR, synopsis: r[P3]=r[P1]r[P2] /
17206	#define OP_Divide 110 /* same as TK_SLASH, synopsis: r[P3]=r[P2]/r[P1] */
17207	#define OP_Remainder 111 /* same as TK_REM, synopsis: r[P3]=r[P2]%r[P1] */
17208	#define OP_Concat 112 /* same as TK_CONCAT, synopsis: r[P3]=r[P2]+r[P1] */
17209	#define OP_OpenRead 113 /* synopsis: root=P2 iDb=P3 */
17210	#define OP_OpenWrite 114 /* synopsis: root=P2 iDb=P3 */
17211	#define OP_BitNot 115 /* same as TK_BITNOT, synopsis: r[P2]= ~r[P1] */
17212	#define OP_OpenDup 116
17213	#define OP_OpenAutoindex 117 /* synopsis: nColumn=P2 */
17214	#define OP_String8 118 /* same as TK_STRING, synopsis: r[P2]='P4' */
17215	#define OP_OpenEphemeral 119 /* synopsis: nColumn=P2 */
17216	#define OP_SorterOpen 120
17217	#define OP_SequenceTest 121 /* synopsis: if( cursor[P1].ctr++ ) pc = P2 */
17218	#define OP_OpenPseudo 122 /* synopsis: P3 columns in r[P2] */
17219	#define OP_Close 123
17220	#define OP_ColumnsUsed 124
17221	#define OP_SeekScan 125 /* synopsis: Scan-ahead up to P1 rows */
17222	#define OP_SeekHit 126 /* synopsis: set P2<=seekHit<=P3 */
17223	#define OP_Sequence 127 /* synopsis: r[P2]=cursor[P1].ctr++ */
17224	#define OP_NewRowid 128 /* synopsis: r[P2]=rowid */
17225	#define OP_Insert 129 /* synopsis: intkey=r[P3] data=r[P2] */
17226	#define OP_RowCell 130
17227	#define OP_Delete 131
17228	#define OP_ResetCount 132
17229	#define OP_SorterCompare 133 /* synopsis: if key(P1)!=trim(r[P3],P4) goto P2 */
17230	#define OP_SorterData 134 /* synopsis: r[P2]=data */
17231	#define OP_RowData 135 /* synopsis: r[P2]=data */
17232	#define OP_Rowid 136 /* synopsis: r[P2]=PX rowid of P1 */
17233	#define OP_NullRow 137
17234	#define OP_SeekEnd 138
17235	#define OP_IdxInsert 139 /* synopsis: key=r[P2] */
17236	#define OP_SorterInsert 140 /* synopsis: key=r[P2] */
17237	#define OP_IdxDelete 141 /* synopsis: key=r[P2@P3] */
17238	#define OP_DeferredSeek 142 /* synopsis: Move P3 to P1.rowid if needed */
17239	#define OP_IdxRowid 143 /* synopsis: r[P2]=rowid */
17240	#define OP_FinishSeek 144
17241	#define OP_Destroy 145
17242	#define OP_Clear 146
17243	#define OP_ResetSorter 147
17244	#define OP_CreateBtree 148 /* synopsis: r[P2]=root iDb=P1 flags=P3 */
17245	#define OP_SqlExec 149
17246	#define OP_ParseSchema 150
17247	#define OP_LoadAnalysis 151
17248	#define OP_DropTable 152
17249	#define OP_DropIndex 153
17250	#define OP_Real 154 /* same as TK_FLOAT, synopsis: r[P2]=P4 */
17251	#define OP_DropTrigger 155
17252	#define OP_IntegrityCk 156
17253	#define OP_RowSetAdd 157 /* synopsis: rowset(P1)=r[P2] */
17254	#define OP_Param 158
17255	#define OP_FkCounter 159 /* synopsis: fkctr[P1]+=P2 */
17256	#define OP_MemMax 160 /* synopsis: r[P1]=max(r[P1],r[P2]) */
17257	#define OP_OffsetLimit 161 /* synopsis: if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1) */
17258	#define OP_AggInverse 162 /* synopsis: accum=r[P3] inverse(r[P2@P5]) */
17259	#define OP_AggStep 163 /* synopsis: accum=r[P3] step(r[P2@P5]) */
17260	#define OP_AggStep1 164 /* synopsis: accum=r[P3] step(r[P2@P5]) */
17261	#define OP_AggValue 165 /* synopsis: r[P3]=value N=P2 */
17262	#define OP_AggFinal 166 /* synopsis: accum=r[P1] N=P2 */
17263	#define OP_Expire 167
17264	#define OP_CursorLock 168
17265	#define OP_CursorUnlock 169
17266	#define OP_TableLock 170 /* synopsis: iDb=P1 root=P2 write=P3 */
17267	#define OP_VBegin 171
17268	#define OP_VCreate 172
17269	#define OP_VDestroy 173
17270	#define OP_VOpen 174
17271	#define OP_VCheck 175
17272	#define OP_VInitIn 176 /* synopsis: r[P2]=ValueList(P1,P3) */
17273	#define OP_VColumn 177 /* synopsis: r[P3]=vcolumn(P2) */
17274	#define OP_VRename 178
17275	#define OP_Pagecount 179
17276	#define OP_MaxPgcnt 180
17277	#define OP_ClrSubtype 181 /* synopsis: r[P1].subtype = 0 */
17278	#define OP_GetSubtype 182 /* synopsis: r[P2] = r[P1].subtype */
17279	#define OP_SetSubtype 183 /* synopsis: r[P2].subtype = r[P1] */
17280	#define OP_FilterAdd 184 /* synopsis: filter(P1) += key(P3@P4) */
17281	#define OP_Trace 185
17282	#define OP_CursorHint 186
17283	#define OP_ReleaseReg 187 /* synopsis: release r[P1@P2] mask P3 */
17284	#define OP_Noop 188
17285	#define OP_Explain 189
17286	#define OP_Abortable 190
17287
17288	/* Properties such as "out2" or "jump" that are specified in
17289	** comments following the "case" for each opcode in the vdbe.c
17290	** are encoded into bitvectors as follows:
17291	*/
	@@ -17249,38 +17300,38 @@
17300	#define OPFLG_INITIALIZER {\
17301	/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x41, 0x00,\
17302	/* 8 */ 0x81, 0x01, 0x01, 0x81, 0x83, 0x83, 0x01, 0x01,\
17303	/* 16 */ 0x03, 0x03, 0x01, 0x12, 0x01, 0xc9, 0xc9, 0xc9,\
17304	/* 24 */ 0xc9, 0x01, 0x49, 0x49, 0x49, 0x49, 0xc9, 0x49,\
17305	/* 32 */ 0xc1, 0x01, 0x41, 0x41, 0xc1, 0x01, 0x01, 0x41,\
17306	/* 40 */ 0x41, 0x41, 0x41, 0x26, 0x26, 0x41, 0x41, 0x23,\
17307	/* 48 */ 0x0b, 0x81, 0x01, 0x03, 0x03, 0x0b, 0x0b, 0x0b,\
17308	/* 56 */ 0x0b, 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x03, 0x01,\
17309	/* 64 */ 0x41, 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00,\
17310	/* 72 */ 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10,\
17311	/* 80 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02,\
17312	/* 88 */ 0x02, 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x40,\
17313	/* 96 */ 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x40, 0x26,\
17314	/* 104 */ 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26,\
17315	/* 112 */ 0x26, 0x40, 0x00, 0x12, 0x40, 0x40, 0x10, 0x40,\
17316	/* 120 */ 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x40, 0x10,\
17317	/* 128 */ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,\
17318	/* 136 */ 0x50, 0x00, 0x40, 0x04, 0x04, 0x00, 0x40, 0x50,\
17319	/* 144 */ 0x40, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,\
17320	/* 152 */ 0x00, 0x00, 0x10, 0x00, 0x00, 0x06, 0x10, 0x00,\
17321	/* 160 */ 0x04, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
17322	/* 168 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10,\
17323	/* 176 */ 0x50, 0x40, 0x00, 0x10, 0x10, 0x02, 0x12, 0x12,\
17324	/* 184 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,}
17325
17326	/* The resolve3P2Values() routine is able to run faster if it knows
17327	** the value of the largest JUMP opcode. The smaller the maximum
17328	** JUMP opcode the better, so the mkopcodeh.tcl script that
17329	** generated this include file strives to group all JUMP opcodes
17330	** together near the beginning of the list.
17331	*/
17332	#define SQLITE_MX_JUMP_OPCODE 65 /* Maximum JUMP opcode */
17333
17334	/************ End of opcodes.h *******************************************/
17335	/************ Continuing where we left off in vdbe.h *********************/
17336
17337	/*
	@@ -17400,11 +17451,11 @@
17451	SQLITE_PRIVATE char sqlite3VdbeExpandSql(Vdbe, const char*);
17452	#endif
17453	SQLITE_PRIVATE int sqlite3MemCompare(const Mem, const Mem, const CollSeq*);
17454	SQLITE_PRIVATE int sqlite3BlobCompare(const Mem, const Mem);
17455
17456	SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(int,const void,UnpackedRecord);
17457	SQLITE_PRIVATE int sqlite3VdbeRecordCompare(int,const void,UnpackedRecord);
17458	SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip(int, const void , UnpackedRecord , int);
17459	SQLITE_PRIVATE UnpackedRecord sqlite3VdbeAllocUnpackedRecord(KeyInfo);
17460
17461	typedef int (RecordCompare)(int,const void,UnpackedRecord*);
	@@ -17413,11 +17464,13 @@
17464	SQLITE_PRIVATE void sqlite3VdbeLinkSubProgram(Vdbe , SubProgram );
17465	SQLITE_PRIVATE int sqlite3VdbeHasSubProgram(Vdbe*);
17466
17467	SQLITE_PRIVATE void sqlite3MemSetArrayInt64(sqlite3_value *aMem, int iIdx, i64 val);
17468
17469	#ifndef SQLITE_OMIT_DATETIME_FUNCS
17470	SQLITE_PRIVATE int sqlite3NotPureFunc(sqlite3_context*);
17471	#endif
17472	#ifdef SQLITE_ENABLE_BYTECODE_VTAB
17473	SQLITE_PRIVATE int sqlite3VdbeBytecodeVtabInit(sqlite3*);
17474	#endif
17475
17476	/* Use SQLITE_ENABLE_EXPLAIN_COMMENTS to enable generation of extra
	@@ -18295,10 +18348,11 @@
18348	#define SQLITE_Coroutines 0x02000000 /* Co-routines for subqueries */
18349	#define SQLITE_NullUnusedCols 0x04000000 /* NULL unused columns in subqueries */
18350	#define SQLITE_OnePass 0x08000000 /* Single-pass DELETE and UPDATE */
18351	#define SQLITE_OrderBySubq 0x10000000 /* ORDER BY in subquery helps outer */
18352	#define SQLITE_StarQuery 0x20000000 /* Heurists for star queries */
18353	#define SQLITE_ExistsToJoin 0x40000000 /* The EXISTS-to-JOIN optimization */
18354	#define SQLITE_AllOpts 0xffffffff /* All optimizations */
18355
18356	/*
18357	** Macros for testing whether or not optimizations are enabled or disabled.
18358	*/
	@@ -18533,11 +18587,11 @@
18587	SQLITE_FUNC_CONSTANT\|SQLITE_UTF8\|(bNC*SQLITE_FUNC_NEEDCOLL)\|extraFlags,\
18588	SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, 0, #zName, {0} }
18589	#define STR_FUNCTION(zName, nArg, pArg, bNC, xFunc) \
18590	{nArg, SQLITE_FUNC_BUILTIN\|\
18591	SQLITE_FUNC_SLOCHNG\|SQLITE_UTF8\|(bNC*SQLITE_FUNC_NEEDCOLL), \
18592	pArg, 0, xFunc, 0, 0, 0, #zName, {0} }
18593	#define LIKEFUNC(zName, nArg, arg, flags) \
18594	{nArg, SQLITE_FUNC_BUILTIN\|SQLITE_FUNC_CONSTANT\|SQLITE_UTF8\|flags, \
18595	(void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} }
18596	#define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \
18597	{nArg, SQLITE_FUNC_BUILTIN\|SQLITE_UTF8\|(nc*SQLITE_FUNC_NEEDCOLL)\|f, \
	@@ -18700,10 +18754,11 @@
18754	#define SQLITE_AFF_TEXT 0x42 /* 'B' */
18755	#define SQLITE_AFF_NUMERIC 0x43 /* 'C' */
18756	#define SQLITE_AFF_INTEGER 0x44 /* 'D' */
18757	#define SQLITE_AFF_REAL 0x45 /* 'E' */
18758	#define SQLITE_AFF_FLEXNUM 0x46 /* 'F' */
18759	#define SQLITE_AFF_DEFER 0x58 /* 'X' - defer computation until later */
18760
18761	#define sqlite3IsNumericAffinity(X) ((X)>=SQLITE_AFF_NUMERIC)
18762
18763	/*
18764	** The SQLITE_AFF_MASK values masks off the significant bits of an
	@@ -19015,13 +19070,19 @@
19070	/*
19071	** An instance of the following structure is passed as the first
19072	** argument to sqlite3VdbeKeyCompare and is used to control the
19073	** comparison of the two index keys.
19074	**
19075	** The aSortOrder[] and aColl[] arrays have nAllField slots each. There
19076	** are nKeyField slots for the columns of an index then extra slots
19077	** for the rowid or key at the end. The aSortOrder array is located after
19078	** the aColl[] array.
19079	**
19080	** If SQLITE_ENABLE_PREUPDATE_HOOK is defined, then aSortFlags might be NULL
19081	** to indicate that this object is for use by a preupdate hook. When aSortFlags
19082	** is NULL, then nAllField is uninitialized and no space is allocated for
19083	** aColl[], so those fields may not be used.
19084	*/
19085	struct KeyInfo {
19086	u32 nRef; /* Number of references to this KeyInfo object */
19087	u8 enc; /* Text encoding - one of the SQLITE_UTF* values */
19088	u16 nKeyField; /* Number of key columns in the index */
	@@ -19029,12 +19090,21 @@
19090	sqlite3 db; / The database connection */
19091	u8 aSortFlags; / Sort order for each column. */
19092	CollSeq aColl[FLEXARRAY]; / Collating sequence for each term of the key */
19093	};
19094
19095	/* The size (in bytes) of a KeyInfo object with up to N fields. This includes
19096	** the main body of the KeyInfo object and the aColl[] array of N elements,
19097	** but does not count the memory used to hold aSortFlags[]. */
19098	#define SZ_KEYINFO(N) (offsetof(KeyInfo,aColl) + (N)sizeof(CollSeq))
19099
19100	/* The size of a bare KeyInfo with no aColl[] entries */
19101	#if FLEXARRAY+1 > 1
19102	# define SZ_KEYINFO_0 offsetof(KeyInfo,aColl)
19103	#else
19104	# define SZ_KEYINFO_0 sizeof(KeyInfo)
19105	#endif
19106
19107	/*
19108	** Allowed bit values for entries in the KeyInfo.aSortFlags[] array.
19109	*/
19110	#define KEYINFO_ORDER_DESC 0x01 /* DESC sort order */
	@@ -19050,23 +19120,22 @@
19120	** the OP_MakeRecord opcode of the VDBE and is disassembled by the
19121	** OP_Column opcode.
19122	**
19123	** An instance of this object serves as a "key" for doing a search on
19124	** an index b+tree. The goal of the search is to find the entry that
19125	** is closest to the key described by this object. This object might hold
19126	** just a prefix of the key. The number of fields is given by nField.

19127	**
19128	** The r1 and r2 fields are the values to return if this key is less than
19129	** or greater than a key in the btree, respectively. These are normally
19130	** -1 and +1 respectively, but might be inverted to +1 and -1 if the b-tree
19131	** is in DESC order.
19132	**
19133	** The key comparison functions actually return default_rc when they find
19134	** an equals comparison. default_rc can be -1, 0, or +1. If there are
19135	** multiple entries in the b-tree with the same key (when only looking
19136	** at the first nField elements) then default_rc can be set to -1 to
19137	** cause the search to find the last match, or +1 to cause the search to
19138	** find the first match.
19139	**
19140	** The key comparison functions will set eqSeen to true if they ever
19141	** get and equal results when comparing this structure to a b-tree record.
	@@ -19074,12 +19143,12 @@
19143	** before the first match or immediately after the last match. The
19144	** eqSeen field will indicate whether or not an exact match exists in the
19145	** b-tree.
19146	*/
19147	struct UnpackedRecord {
19148	KeyInfo pKeyInfo; / Comparison info for the index that is unpacked */
19149	Mem aMem; / Values for columns of the index */
19150	union {
19151	char z; / Cache of aMem[0].z for vdbeRecordCompareString() */
19152	i64 i; /* Cache of aMem[0].u.i for vdbeRecordCompareInt() */
19153	} u;
19154	int n; /* Cache of aMem[0].n used by vdbeRecordCompareString() */
	@@ -19160,14 +19229,12 @@
19229	unsigned uniqNotNull:1; /* True if UNIQUE and NOT NULL for all columns */
19230	unsigned isResized:1; /* True if resizeIndexObject() has been called */
19231	unsigned isCovering:1; /* True if this is a covering index */
19232	unsigned noSkipScan:1; /* Do not try to use skip-scan if true */
19233	unsigned hasStat1:1; /* aiRowLogEst values come from sqlite_stat1 */

19234	unsigned bNoQuery:1; /* Do not use this index to optimize queries */
19235	unsigned bAscKeyBug:1; /* True if the bba7b69f9849b5bf bug applies */

19236	unsigned bHasVCol:1; /* Index references one or more VIRTUAL columns */
19237	unsigned bHasExpr:1; /* Index contains an expression, either a literal
19238	** expression, or a reference to a VIRTUAL column */
19239	#ifdef SQLITE_ENABLE_STAT4
19240	int nSample; /* Number of elements in aSample[] */
	@@ -19251,21 +19318,21 @@
19318	struct AggInfo {
19319	u8 directMode; /* Direct rendering mode means take data directly
19320	** from source tables rather than from accumulators */
19321	u8 useSortingIdx; /* In direct mode, reference the sorting index rather
19322	** than the source table */
19323	u32 nSortingColumn; /* Number of columns in the sorting index */
19324	int sortingIdx; /* Cursor number of the sorting index */
19325	int sortingIdxPTab; /* Cursor number of pseudo-table */
19326	int iFirstReg; /* First register in range for aCol[] and aFunc[] */
19327	ExprList pGroupBy; / The group by clause */
19328	struct AggInfo_col { /* For each column used in source tables */
19329	Table pTab; / Source table */
19330	Expr pCExpr; / The original expression */
19331	int iTable; /* Cursor number of the source table */
19332	int iColumn; /* Column number within the source table */
19333	int iSorterColumn; /* Column number in the sorting index */
19334	} *aCol;
19335	int nColumn; /* Number of used entries in aCol[] */
19336	int nAccumulator; /* Number of columns that show through to the output.
19337	** Additional columns are used only as parameters to
19338	** aggregate functions */
	@@ -19725,10 +19792,11 @@
19792	unsigned isSynthUsing :1; /* u3.pUsing is synthesized from NATURAL */
19793	unsigned isNestedFrom :1; /* pSelect is a SF_NestedFrom subquery */
19794	unsigned rowidUsed :1; /* The ROWID of this table is referenced */
19795	unsigned fixedSchema :1; /* Uses u4.pSchema, not u4.zDatabase */
19796	unsigned hadSchema :1; /* Had u4.zDatabase before u4.pSchema */
19797	unsigned fromExists :1; /* Comes from WHERE EXISTS(...) */
19798	} fg;
19799	int iCursor; /* The VDBE cursor number used to access this table */
19800	Bitmask colUsed; /* Bit N set if column N used. Details above for N>62 */
19801	union {
19802	char zIndexedBy; / Identifier from "INDEXED BY <zIndex>" clause */
	@@ -20255,10 +20323,11 @@
20323	u8 mayAbort; /* True if statement may throw an ABORT exception */
20324	u8 hasCompound; /* Need to invoke convertCompoundSelectToSubquery() */
20325	u8 disableLookaside; /* Number of times lookaside has been disabled */
20326	u8 prepFlags; /* SQLITE_PREPARE_* flags */
20327	u8 withinRJSubrtn; /* Nesting level for RIGHT JOIN body subroutines */
20328	u8 bHasExists; /* Has a correlated "EXISTS (SELECT ....)" expression */
20329	u8 mSubrtnSig; /* mini Bloom filter on available SubrtnSig.selId */
20330	u8 eTriggerOp; /* TK_UPDATE, TK_INSERT or TK_DELETE */
20331	u8 bReturning; /* Coding a RETURNING trigger */
20332	u8 eOrconf; /* Default ON CONFLICT policy for trigger steps */
20333	u8 disableTriggers; /* True to disable triggers */
	@@ -21251,10 +21320,11 @@
21320	#endif
21321	#ifndef SQLITE_OMIT_WINDOWFUNC
21322	SQLITE_PRIVATE void sqlite3ShowWindow(const Window*);
21323	SQLITE_PRIVATE void sqlite3ShowWinFunc(const Window*);
21324	#endif
21325	SQLITE_PRIVATE void sqlite3ShowBitvec(Bitvec*);
21326	#endif
21327
21328	SQLITE_PRIVATE void sqlite3SetString(char *, sqlite3, const char*);
21329	SQLITE_PRIVATE void sqlite3ProgressCheck(Parse*);
21330	SQLITE_PRIVATE void sqlite3ErrorMsg(Parse, const char, ...);
	@@ -22424,10 +22494,13 @@
22494	#ifdef SQLITE_BITMASK_TYPE
22495	"BITMASK_TYPE=" CTIMEOPT_VAL(SQLITE_BITMASK_TYPE),
22496	#endif
22497	#ifdef SQLITE_BUG_COMPATIBLE_20160819
22498	"BUG_COMPATIBLE_20160819",
22499	#endif
22500	#ifdef SQLITE_BUG_COMPATIBLE_20250510
22501	"BUG_COMPATIBLE_20250510",
22502	#endif
22503	#ifdef SQLITE_CASE_SENSITIVE_LIKE
22504	"CASE_SENSITIVE_LIKE",
22505	#endif
22506	#ifdef SQLITE_CHECK_PAGES
	@@ -23860,11 +23933,11 @@
23933	** * MEM_Blob A blob, stored in Mem.z length Mem.n.
23934	** Incompatible with MEM_Str, MEM_Null,
23935	** MEM_Int, MEM_Real, and MEM_IntReal.
23936	**
23937	** * MEM_Blob\|MEM_Zero A blob in Mem.z of length Mem.n plus
23938	** Mem.u.nZero extra 0x00 bytes at the end.
23939	**
23940	** * MEM_Int Integer stored in Mem.u.i.
23941	**
23942	** * MEM_Real Real stored in Mem.u.r.
23943	**
	@@ -24129,11 +24202,11 @@
24202	Mem oldipk; /* Memory cell holding "old" IPK value */
24203	Mem aNew; / Array of new.* values */
24204	Table pTab; / Schema object being updated */
24205	Index pPk; / PK index if pTab is WITHOUT ROWID */
24206	sqlite3_value *apDflt; / Array of default values, if required */
24207	u8 keyinfoSpace[SZ_KEYINFO_0]; /* Space to hold pKeyinfo[0] content */
24208	};
24209
24210	/*
24211	** An instance of this object is used to pass an vector of values into
24212	** OP_VFilter, the xFilter method of a virtual table. The vector is the
	@@ -32059,10 +32132,18 @@
32132	}else{
32133	longvalue = va_arg(ap,unsigned int);
32134	}
32135	prefix = 0;
32136	}
32137
32138	#if WHERETRACE_ENABLED
32139	if( xtype==etPOINTER && sqlite3WhereTrace & 0x100000 ) longvalue = 0;
32140	#endif
32141	#if TREETRACE_ENABLED
32142	if( xtype==etPOINTER && sqlite3TreeTrace & 0x100000 ) longvalue = 0;
32143	#endif
32144
32145	if( longvalue==0 ) flag_alternateform = 0;
32146	if( flag_zeropad && precision<width-(prefix!=0) ){
32147	precision = width-(prefix!=0);
32148	}
32149	if( precision<etBUFSIZE-10-etBUFSIZE/3 ){
	@@ -32987,10 +33068,19 @@
33068	va_end(ap);
33069	zBuf[acc.nChar] = 0;
33070	return zBuf;
33071	}
33072
33073	/* Maximum size of an sqlite3_log() message. */
33074	#if defined(SQLITE_MAX_LOG_MESSAGE)
33075	/* Leave the definition as supplied */
33076	#elif SQLITE_PRINT_BUF_SIZE*10>10000
33077	# define SQLITE_MAX_LOG_MESSAGE 10000
33078	#else
33079	# define SQLITE_MAX_LOG_MESSAGE (SQLITE_PRINT_BUF_SIZE*10)
33080	#endif
33081
33082	/*
33083	** This is the routine that actually formats the sqlite3_log() message.
33084	** We house it in a separate routine from sqlite3_log() to avoid using
33085	** stack space on small-stack systems when logging is disabled.
33086	**
	@@ -33003,11 +33093,11 @@
33093	** Care must be taken that any sqlite3_log() calls that occur while the
33094	** memory mutex is held do not use these mechanisms.
33095	*/
33096	static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){
33097	StrAccum acc; /* String accumulator */
33098	char zMsg[SQLITE_MAX_LOG_MESSAGE]; /* Complete log message */
33099
33100	sqlite3StrAccumInit(&acc, 0, zMsg, sizeof(zMsg), 0);
33101	sqlite3_str_vappendf(&acc, zFormat, ap);
33102	sqlite3GlobalConfig.xLog(sqlite3GlobalConfig.pLogArg, iErrCode,
33103	sqlite3StrAccumFinish(&acc));
	@@ -35001,11 +35091,11 @@
35091	}
35092
35093	/*
35094	** Write a single UTF8 character whose value is v into the
35095	** buffer starting at zOut. zOut must be sized to hold at
35096	** least four bytes. Return the number of bytes needed
35097	** to encode the new character.
35098	*/
35099	SQLITE_PRIVATE int sqlite3AppendOneUtf8Character(char *zOut, u32 v){
35100	if( v<0x00080 ){
35101	zOut[0] = (u8)(v & 0xff);
	@@ -37681,76 +37771,76 @@
37771	/* 32 */ "Last" OpHelp(""),
37772	/* 33 */ "IfSizeBetween" OpHelp(""),
37773	/* 34 */ "SorterSort" OpHelp(""),
37774	/* 35 */ "Sort" OpHelp(""),
37775	/* 36 */ "Rewind" OpHelp(""),
37776	/* 37 */ "IfEmpty" OpHelp("if( empty(P1) ) goto P2"),
37777	/* 38 */ "SorterNext" OpHelp(""),
37778	/* 39 */ "Prev" OpHelp(""),
37779	/* 40 */ "Next" OpHelp(""),
37780	/* 41 */ "IdxLE" OpHelp("key=r[P3@P4]"),
37781	/* 42 */ "IdxGT" OpHelp("key=r[P3@P4]"),
37782	/* 43 */ "Or" OpHelp("r[P3]=(r[P1] \|\| r[P2])"),
37783	/* 44 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"),
37784	/* 45 */ "IdxLT" OpHelp("key=r[P3@P4]"),
37785	/* 46 */ "IdxGE" OpHelp("key=r[P3@P4]"),
37786	/* 47 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
37787	/* 48 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
37788	/* 49 */ "Program" OpHelp(""),
37789	/* 50 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
37790	/* 51 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"),
37791	/* 52 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"),
37792	/* 53 */ "Ne" OpHelp("IF r[P3]!=r[P1]"),
37793	/* 54 */ "Eq" OpHelp("IF r[P3]==r[P1]"),
37794	/* 55 */ "Gt" OpHelp("IF r[P3]>r[P1]"),
37795	/* 56 */ "Le" OpHelp("IF r[P3]<=r[P1]"),
37796	/* 57 */ "Lt" OpHelp("IF r[P3]<r[P1]"),
37797	/* 58 */ "Ge" OpHelp("IF r[P3]>=r[P1]"),
37798	/* 59 */ "ElseEq" OpHelp(""),
37799	/* 60 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
37800	/* 61 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
37801	/* 62 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
37802	/* 63 */ "IncrVacuum" OpHelp(""),
37803	/* 64 */ "VNext" OpHelp(""),
37804	/* 65 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
37805	/* 66 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
37806	/* 67 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
37807	/* 68 */ "Return" OpHelp(""),
37808	/* 69 */ "EndCoroutine" OpHelp(""),
37809	/* 70 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
37810	/* 71 */ "Halt" OpHelp(""),
37811	/* 72 */ "Integer" OpHelp("r[P2]=P1"),
37812	/* 73 */ "Int64" OpHelp("r[P2]=P4"),
37813	/* 74 */ "String" OpHelp("r[P2]='P4' (len=P1)"),
37814	/* 75 */ "BeginSubrtn" OpHelp("r[P2]=NULL"),
37815	/* 76 */ "Null" OpHelp("r[P2..P3]=NULL"),
37816	/* 77 */ "SoftNull" OpHelp("r[P1]=NULL"),
37817	/* 78 */ "Blob" OpHelp("r[P2]=P4 (len=P1)"),
37818	/* 79 */ "Variable" OpHelp("r[P2]=parameter(P1)"),
37819	/* 80 */ "Move" OpHelp("r[P2@P3]=r[P1@P3]"),
37820	/* 81 */ "Copy" OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
37821	/* 82 */ "SCopy" OpHelp("r[P2]=r[P1]"),
37822	/* 83 */ "IntCopy" OpHelp("r[P2]=r[P1]"),
37823	/* 84 */ "FkCheck" OpHelp(""),
37824	/* 85 */ "ResultRow" OpHelp("output=r[P1@P2]"),
37825	/* 86 */ "CollSeq" OpHelp(""),
37826	/* 87 */ "AddImm" OpHelp("r[P1]=r[P1]+P2"),
37827	/* 88 */ "RealAffinity" OpHelp(""),
37828	/* 89 */ "Cast" OpHelp("affinity(r[P1])"),
37829	/* 90 */ "Permutation" OpHelp(""),
37830	/* 91 */ "Compare" OpHelp("r[P1@P3] <-> r[P2@P3]"),
37831	/* 92 */ "IsTrue" OpHelp("r[P2] = coalesce(r[P1]==TRUE,P3) ^ P4"),
37832	/* 93 */ "ZeroOrNull" OpHelp("r[P2] = 0 OR NULL"),
37833	/* 94 */ "Offset" OpHelp("r[P3] = sqlite_offset(P1)"),
37834	/* 95 */ "Column" OpHelp("r[P3]=PX cursor P1 column P2"),
37835	/* 96 */ "TypeCheck" OpHelp("typecheck(r[P1@P2])"),
37836	/* 97 */ "Affinity" OpHelp("affinity(r[P1@P2])"),
37837	/* 98 */ "MakeRecord" OpHelp("r[P3]=mkrec(r[P1@P2])"),
37838	/* 99 */ "Count" OpHelp("r[P2]=count()"),
37839	/* 100 */ "ReadCookie" OpHelp(""),
37840	/* 101 */ "SetCookie" OpHelp(""),
37841	/* 102 */ "ReopenIdx" OpHelp("root=P2 iDb=P3"),
37842	/* 103 */ "BitAnd" OpHelp("r[P3]=r[P1]&r[P2]"),
37843	/* 104 */ "BitOr" OpHelp("r[P3]=r[P1]\|r[P2]"),
37844	/* 105 */ "ShiftLeft" OpHelp("r[P3]=r[P2]<<r[P1]"),
37845	/* 106 */ "ShiftRight" OpHelp("r[P3]=r[P2]>>r[P1]"),
37846	/* 107 */ "Add" OpHelp("r[P3]=r[P1]+r[P2]"),
	@@ -37757,87 +37847,88 @@
37847	/* 108 */ "Subtract" OpHelp("r[P3]=r[P2]-r[P1]"),
37848	/* 109 / "Multiply" OpHelp("r[P3]=r[P1]r[P2]"),
37849	/* 110 */ "Divide" OpHelp("r[P3]=r[P2]/r[P1]"),
37850	/* 111 */ "Remainder" OpHelp("r[P3]=r[P2]%r[P1]"),
37851	/* 112 */ "Concat" OpHelp("r[P3]=r[P2]+r[P1]"),
37852	/* 113 */ "OpenRead" OpHelp("root=P2 iDb=P3"),
37853	/* 114 */ "OpenWrite" OpHelp("root=P2 iDb=P3"),
37854	/* 115 */ "BitNot" OpHelp("r[P2]= ~r[P1]"),
37855	/* 116 */ "OpenDup" OpHelp(""),
37856	/* 117 */ "OpenAutoindex" OpHelp("nColumn=P2"),
37857	/* 118 */ "String8" OpHelp("r[P2]='P4'"),
37858	/* 119 */ "OpenEphemeral" OpHelp("nColumn=P2"),
37859	/* 120 */ "SorterOpen" OpHelp(""),
37860	/* 121 */ "SequenceTest" OpHelp("if( cursor[P1].ctr++ ) pc = P2"),
37861	/* 122 */ "OpenPseudo" OpHelp("P3 columns in r[P2]"),
37862	/* 123 */ "Close" OpHelp(""),
37863	/* 124 */ "ColumnsUsed" OpHelp(""),
37864	/* 125 */ "SeekScan" OpHelp("Scan-ahead up to P1 rows"),
37865	/* 126 */ "SeekHit" OpHelp("set P2<=seekHit<=P3"),
37866	/* 127 */ "Sequence" OpHelp("r[P2]=cursor[P1].ctr++"),
37867	/* 128 */ "NewRowid" OpHelp("r[P2]=rowid"),
37868	/* 129 */ "Insert" OpHelp("intkey=r[P3] data=r[P2]"),
37869	/* 130 */ "RowCell" OpHelp(""),
37870	/* 131 */ "Delete" OpHelp(""),
37871	/* 132 */ "ResetCount" OpHelp(""),
37872	/* 133 */ "SorterCompare" OpHelp("if key(P1)!=trim(r[P3],P4) goto P2"),
37873	/* 134 */ "SorterData" OpHelp("r[P2]=data"),
37874	/* 135 */ "RowData" OpHelp("r[P2]=data"),
37875	/* 136 */ "Rowid" OpHelp("r[P2]=PX rowid of P1"),
37876	/* 137 */ "NullRow" OpHelp(""),
37877	/* 138 */ "SeekEnd" OpHelp(""),
37878	/* 139 */ "IdxInsert" OpHelp("key=r[P2]"),
37879	/* 140 */ "SorterInsert" OpHelp("key=r[P2]"),
37880	/* 141 */ "IdxDelete" OpHelp("key=r[P2@P3]"),
37881	/* 142 */ "DeferredSeek" OpHelp("Move P3 to P1.rowid if needed"),
37882	/* 143 */ "IdxRowid" OpHelp("r[P2]=rowid"),
37883	/* 144 */ "FinishSeek" OpHelp(""),
37884	/* 145 */ "Destroy" OpHelp(""),
37885	/* 146 */ "Clear" OpHelp(""),
37886	/* 147 */ "ResetSorter" OpHelp(""),
37887	/* 148 */ "CreateBtree" OpHelp("r[P2]=root iDb=P1 flags=P3"),
37888	/* 149 */ "SqlExec" OpHelp(""),
37889	/* 150 */ "ParseSchema" OpHelp(""),
37890	/* 151 */ "LoadAnalysis" OpHelp(""),
37891	/* 152 */ "DropTable" OpHelp(""),
37892	/* 153 */ "DropIndex" OpHelp(""),
37893	/* 154 */ "Real" OpHelp("r[P2]=P4"),
37894	/* 155 */ "DropTrigger" OpHelp(""),
37895	/* 156 */ "IntegrityCk" OpHelp(""),
37896	/* 157 */ "RowSetAdd" OpHelp("rowset(P1)=r[P2]"),
37897	/* 158 */ "Param" OpHelp(""),
37898	/* 159 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
37899	/* 160 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
37900	/* 161 */ "OffsetLimit" OpHelp("if r[P1]>0 then r[P2]=r[P1]+max(0,r[P3]) else r[P2]=(-1)"),
37901	/* 162 */ "AggInverse" OpHelp("accum=r[P3] inverse(r[P2@P5])"),
37902	/* 163 */ "AggStep" OpHelp("accum=r[P3] step(r[P2@P5])"),
37903	/* 164 */ "AggStep1" OpHelp("accum=r[P3] step(r[P2@P5])"),
37904	/* 165 */ "AggValue" OpHelp("r[P3]=value N=P2"),
37905	/* 166 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
37906	/* 167 */ "Expire" OpHelp(""),
37907	/* 168 */ "CursorLock" OpHelp(""),
37908	/* 169 */ "CursorUnlock" OpHelp(""),
37909	/* 170 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
37910	/* 171 */ "VBegin" OpHelp(""),
37911	/* 172 */ "VCreate" OpHelp(""),
37912	/* 173 */ "VDestroy" OpHelp(""),
37913	/* 174 */ "VOpen" OpHelp(""),
37914	/* 175 */ "VCheck" OpHelp(""),
37915	/* 176 */ "VInitIn" OpHelp("r[P2]=ValueList(P1,P3)"),
37916	/* 177 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
37917	/* 178 */ "VRename" OpHelp(""),
37918	/* 179 */ "Pagecount" OpHelp(""),
37919	/* 180 */ "MaxPgcnt" OpHelp(""),
37920	/* 181 */ "ClrSubtype" OpHelp("r[P1].subtype = 0"),
37921	/* 182 */ "GetSubtype" OpHelp("r[P2] = r[P1].subtype"),
37922	/* 183 */ "SetSubtype" OpHelp("r[P2].subtype = r[P1]"),
37923	/* 184 */ "FilterAdd" OpHelp("filter(P1) += key(P3@P4)"),
37924	/* 185 */ "Trace" OpHelp(""),
37925	/* 186 */ "CursorHint" OpHelp(""),
37926	/* 187 */ "ReleaseReg" OpHelp("release r[P1@P2] mask P3"),
37927	/* 188 */ "Noop" OpHelp(""),
37928	/* 189 */ "Explain" OpHelp(""),
37929	/* 190 */ "Abortable" OpHelp(""),
37930	};
37931	return azName[i];
37932	}
37933	#endif
37934
	@@ -43860,25 +43951,24 @@
43951	assert( pShmNode->hShm<0 \|\| pDbFd->pInode->bProcessLock==0 );
43952
43953	/* Check that, if this to be a blocking lock, no locks that occur later
43954	** in the following list than the lock being obtained are already held:
43955	**
43956	** 1. Recovery lock (ofst==2).
43957	** 2. Checkpointer lock (ofst==1).
43958	** 3. Write lock (ofst==0).
43959	** 4. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).
43960	**
43961	** In other words, if this is a blocking lock, none of the locks that
43962	** occur later in the above list than the lock being obtained may be
43963	** held.


43964	*/
43965	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
43966	{
43967	u16 lockMask = (p->exclMask\|p->sharedMask);
43968	assert( (flags & SQLITE_SHM_UNLOCK) \|\| pDbFd->iBusyTimeout==0 \|\| (
43969	(ofst!=2 \|\| lockMask==0)
43970	&& (ofst!=1 \|\| lockMask==0 \|\| lockMask==2)
43971	&& (ofst!=0 \|\| lockMask<3)
43972	&& (ofst<3 \|\| lockMask<(1<<ofst))
43973	));
43974	}
	@@ -49835,11 +49925,15 @@
49925	DWORD nDelay = (nMs==0 ? INFINITE : nMs);
49926	DWORD res = osWaitForSingleObject(ovlp.hEvent, nDelay);
49927	if( res==WAIT_OBJECT_0 ){
49928	ret = TRUE;
49929	}else if( res==WAIT_TIMEOUT ){
49930	#if SQLITE_ENABLE_SETLK_TIMEOUT==1
49931	rc = SQLITE_BUSY_TIMEOUT;
49932	#else
49933	rc = SQLITE_BUSY;
49934	#endif
49935	}else{
49936	/* Some other error has occurred */
49937	rc = SQLITE_IOERR_LOCK;
49938	}
49939
	@@ -51321,17 +51415,17 @@
51415	int nChar;
51416	LPWSTR zWideFilename;
51417
51418	if( osCygwin_conv_path && !(winIsDriveLetterAndColon(zFilename)
51419	&& winIsDirSep(zFilename[2])) ){
51420	i64 nByte;
51421	int convertflag = CCP_POSIX_TO_WIN_W;
51422	if( !strchr(zFilename, '/') ) convertflag \|= CCP_RELATIVE;
51423	nByte = (i64)osCygwin_conv_path(convertflag,
51424	zFilename, 0, 0);
51425	if( nByte>0 ){
51426	zConverted = sqlite3MallocZero(12+(u64)nByte);
51427	if ( zConverted==0 ){
51428	return zConverted;
51429	}
51430	zWideFilename = zConverted;
51431	/* Filenames should be prefixed, except when converted
	@@ -51646,25 +51740,24 @@
51740	assert( n==1 \|\| (flags & SQLITE_SHM_EXCLUSIVE)!=0 );
51741
51742	/* Check that, if this to be a blocking lock, no locks that occur later
51743	** in the following list than the lock being obtained are already held:
51744	**
51745	** 1. Recovery lock (ofst==2).
51746	** 2. Checkpointer lock (ofst==1).
51747	** 3. Write lock (ofst==0).
51748	** 4. Read locks (ofst>=3 && ofst<SQLITE_SHM_NLOCK).
51749	**
51750	** In other words, if this is a blocking lock, none of the locks that
51751	** occur later in the above list than the lock being obtained may be
51752	** held.


51753	*/
51754	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
51755	{
51756	u16 lockMask = (p->exclMask\|p->sharedMask);
51757	assert( (flags & SQLITE_SHM_UNLOCK) \|\| pDbFd->iBusyTimeout==0 \|\| (
51758	(ofst!=2 \|\| lockMask==0)
51759	&& (ofst!=1 \|\| lockMask==0 \|\| lockMask==2)
51760	&& (ofst!=0 \|\| lockMask<3)
51761	&& (ofst<3 \|\| lockMask<(1<<ofst))
51762	));
51763	}
	@@ -52210,31 +52303,10 @@
52303	**
52304	** This division contains the implementation of methods on the
52305	** sqlite3_vfs object.
52306	*/
52307





















52308	/*
52309	** This function returns non-zero if the specified UTF-8 string buffer
52310	** ends with a directory separator character or one was successfully
52311	** added to it.
52312	*/
	@@ -52370,46 +52442,10 @@
52442	sqlite3_snprintf(nMax, zBuf, "%s", zDir);
52443	sqlite3_free(zConverted);
52444	break;
52445	}
52446	sqlite3_free(zConverted);




































52447	}
52448	}
52449	}
52450	#endif
52451
	@@ -53304,38 +53340,10 @@
53340	winSimplifyName(zFull);
53341	return rc;
53342	}
53343	}
53344	#endif /* __CYGWIN__ */




























53345
53346	#if (SQLITE_OS_WINCE \|\| SQLITE_OS_WINRT) && defined(_WIN32)
53347	SimulateIOError( return SQLITE_ERROR );
53348	/* WinCE has no concept of a relative pathname, or so I am told. */
53349	/* WinRT has no way to convert a relative path to an absolute one. */
	@@ -53477,31 +53485,12 @@
53485	** Interfaces for opening a shared library, finding entry points
53486	** within the shared library, and closing the shared library.
53487	*/
53488	static void winDlOpen(sqlite3_vfs pVfs, const char *zFilename){
53489	HANDLE h;


















53490	void *zConverted = winConvertFromUtf8Filename(zFilename);
53491	UNUSED_PARAMETER(pVfs);

53492	if( zConverted==0 ){
53493	OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
53494	return 0;
53495	}
53496	if( osIsNT() ){
	@@ -54943,10 +54932,11 @@
54932	BITVEC_TELEM aBitmap[BITVEC_NELEM]; /* Bitmap representation */
54933	u32 aHash[BITVEC_NINT]; /* Hash table representation */
54934	Bitvec apSub[BITVEC_NPTR]; / Recursive representation */
54935	} u;
54936	};
54937
54938
54939	/*
54940	** Create a new bitmap object able to handle bits between 0 and iSize,
54941	** inclusive. Return a pointer to the new object. Return NULL if
54942	** malloc fails.
	@@ -55053,11 +55043,13 @@
55043	if( aiValues==0 ){
55044	return SQLITE_NOMEM_BKPT;
55045	}else{
55046	memcpy(aiValues, p->u.aHash, sizeof(p->u.aHash));
55047	memset(p->u.apSub, 0, sizeof(p->u.apSub));
55048	p->iDivisor = p->iSize/BITVEC_NPTR;
55049	if( (p->iSize%BITVEC_NPTR)!=0 ) p->iDivisor++;
55050	if( p->iDivisor<BITVEC_NBIT ) p->iDivisor = BITVEC_NBIT;
55051	rc = sqlite3BitvecSet(p, i);
55052	for(j=0; j<BITVEC_NINT; j++){
55053	if( aiValues[j] ) rc \|= sqlite3BitvecSet(p, aiValues[j]);
55054	}
55055	sqlite3StackFree(0, aiValues);
	@@ -55129,10 +55121,56 @@
55121	** was created.
55122	*/
55123	SQLITE_PRIVATE u32 sqlite3BitvecSize(Bitvec *p){
55124	return p->iSize;
55125	}
55126
55127	#ifdef SQLITE_DEBUG
55128	/*
55129	** Show the content of a Bitvec option and its children. Indent
55130	** everything by n spaces. Add x to each bitvec value.
55131	**
55132	** From a debugger such as gdb, one can type:
55133	**
55134	** call sqlite3ShowBitvec(p)
55135	**
55136	** For some Bitvec p and see a recursive view of the Bitvec's content.
55137	*/
55138	static void showBitvec(Bitvec *p, int n, unsigned x){
55139	int i;
55140	if( p==0 ){
55141	printf("NULL\n");
55142	return;
55143	}
55144	printf("Bitvec 0x%p iSize=%u", p, p->iSize);
55145	if( p->iSize<=BITVEC_NBIT ){
55146	printf(" bitmap\n");
55147	printf("%*s bits:", n, "");
55148	for(i=1; i<=BITVEC_NBIT; i++){
55149	if( sqlite3BitvecTest(p,i) ) printf(" %u", x+(unsigned)i);
55150	}
55151	printf("\n");
55152	}else if( p->iDivisor==0 ){
55153	printf(" hash with %u entries\n", p->nSet);
55154	printf("%*s bits:", n, "");
55155	for(i=0; i<BITVEC_NINT; i++){
55156	if( p->u.aHash[i] ) printf(" %u", x+(unsigned)p->u.aHash[i]);
55157	}
55158	printf("\n");
55159	}else{
55160	printf(" sub-bitvec with iDivisor=%u\n", p->iDivisor);
55161	for(i=0; i<BITVEC_NPTR; i++){
55162	if( p->u.apSub[i]==0 ) continue;
55163	printf("%*s apSub[%d]=", n, "", i);
55164	showBitvec(p->u.apSub[i], n+4, i*p->iDivisor);
55165	}
55166	}
55167	}
55168	SQLITE_PRIVATE void sqlite3ShowBitvec(Bitvec *p){
55169	showBitvec(p, 0, 0);
55170	}
55171	#endif
55172
55173	#ifndef SQLITE_UNTESTABLE
55174	/*
55175	** Let V[] be an array of unsigned characters sufficient to hold
55176	** up to N bits. Let I be an integer between 0 and N. 0<=I<N.
	@@ -55140,40 +55178,48 @@
55178	** individual bits within V.
55179	*/
55180	#define SETBIT(V,I) V[I>>3] \|= (1<<(I&7))
55181	#define CLEARBIT(V,I) V[I>>3] &= ~(BITVEC_TELEM)(1<<(I&7))
55182	#define TESTBIT(V,I) (V[I>>3]&(1<<(I&7)))!=0
55183
55184
55185	/*
55186	** This routine runs an extensive test of the Bitvec code.
55187	**
55188	** The input is an array of integers that acts as a program
55189	** to test the Bitvec. The integers are opcodes followed
55190	** by 0, 1, or 3 operands, depending on the opcode. Another
55191	** opcode follows immediately after the last operand.
55192	**
55193	** There are opcodes numbered starting with 0. 0 is the
55194	** "halt" opcode and causes the test to end.
55195	**
55196	** 0 Halt and return the number of errors
55197	** 1 N S X Set N bits beginning with S and incrementing by X
55198	** 2 N S X Clear N bits beginning with S and incrementing by X
55199	** 3 N Set N randomly chosen bits
55200	** 4 N Clear N randomly chosen bits
55201	** 5 N S X Set N bits from S increment X in array only, not in bitvec
55202	** 6 Invoice sqlite3ShowBitvec() on the Bitvec object so far
55203	** 7 X Show compile-time parameters and the hash of X
55204	**
55205	** The opcodes 1 through 4 perform set and clear operations are performed
55206	** on both a Bitvec object and on a linear array of bits obtained from malloc.
55207	** Opcode 5 works on the linear array only, not on the Bitvec.
55208	** Opcode 5 is used to deliberately induce a fault in order to
55209	** confirm that error detection works. Opcodes 6 and greater are
55210	** state output opcodes. Opcodes 6 and greater are no-ops unless
55211	** SQLite has been compiled with SQLITE_DEBUG.
55212	**
55213	** At the conclusion of the test the linear array is compared
55214	** against the Bitvec object. If there are any differences,
55215	** an error is returned. If they are the same, zero is returned.
55216	**
55217	** If a memory allocation error occurs, return -1.
55218	**
55219	** sz is the size of the Bitvec. Or if sz is negative, make the size
55220	** 2*(unsigned)(-sz) and disabled the linear vector check.
55221	*/
55222	SQLITE_PRIVATE int sqlite3BitvecBuiltinTest(int sz, int *aOp){
55223	Bitvec *pBitvec = 0;
55224	unsigned char *pV = 0;
55225	int rc = -1;
	@@ -55180,22 +55226,45 @@
55226	int i, nx, pc, op;
55227	void *pTmpSpace;
55228
55229	/* Allocate the Bitvec to be tested and a linear array of
55230	** bits to act as the reference */
55231	if( sz<=0 ){
55232	pBitvec = sqlite3BitvecCreate( 2*(unsigned)(-sz) );
55233	pV = 0;
55234	}else{
55235	pBitvec = sqlite3BitvecCreate( sz );
55236	pV = sqlite3MallocZero( (7+(i64)sz)/8 + 1 );
55237	}
55238	pTmpSpace = sqlite3_malloc64(BITVEC_SZ);
55239	if( pBitvec==0 \|\| pTmpSpace==0 \|\| (pV==0 && sz>0) ) goto bitvec_end;
55240
55241	/* NULL pBitvec tests */
55242	sqlite3BitvecSet(0, 1);
55243	sqlite3BitvecClear(0, 1, pTmpSpace);
55244
55245	/* Run the program */
55246	pc = i = 0;
55247	while( (op = aOp[pc])!=0 ){
55248	if( op>=6 ){
55249	#ifdef SQLITE_DEBUG
55250	if( op==6 ){
55251	sqlite3ShowBitvec(pBitvec);
55252	}else if( op==7 ){
55253	printf("BITVEC_SZ = %d (%d by sizeof)\n",
55254	BITVEC_SZ, (int)sizeof(Bitvec));
55255	printf("BITVEC_USIZE = %d\n", (int)BITVEC_USIZE);
55256	printf("BITVEC_NELEM = %d\n", (int)BITVEC_NELEM);
55257	printf("BITVEC_NBIT = %d\n", (int)BITVEC_NBIT);
55258	printf("BITVEC_NINT = %d\n", (int)BITVEC_NINT);
55259	printf("BITVEC_MXHASH = %d\n", (int)BITVEC_MXHASH);
55260	printf("BITVEC_NPTR = %d\n", (int)BITVEC_NPTR);
55261	}
55262	#endif
55263	pc++;
55264	continue;
55265	}
55266	switch( op ){
55267	case 1:
55268	case 2:
55269	case 5: {
55270	nx = 4;
	@@ -55213,33 +55282,37 @@
55282	}
55283	if( (--aOp[pc+1]) > 0 ) nx = 0;
55284	pc += nx;
55285	i = (i & 0x7fffffff)%sz;
55286	if( (op & 1)!=0 ){
55287	if( pV ) SETBIT(pV, (i+1));
55288	if( op!=5 ){
55289	if( sqlite3BitvecSet(pBitvec, i+1) ) goto bitvec_end;
55290	}
55291	}else{
55292	if( pV ) CLEARBIT(pV, (i+1));
55293	sqlite3BitvecClear(pBitvec, i+1, pTmpSpace);
55294	}
55295	}
55296
55297	/* Test to make sure the linear array exactly matches the
55298	** Bitvec object. Start with the assumption that they do
55299	** match (rc==0). Change rc to non-zero if a discrepancy
55300	** is found.
55301	*/
55302	if( pV ){
55303	rc = sqlite3BitvecTest(0,0) + sqlite3BitvecTest(pBitvec, sz+1)
55304	+ sqlite3BitvecTest(pBitvec, 0)
55305	+ (sqlite3BitvecSize(pBitvec) - sz);
55306	for(i=1; i<=sz; i++){
55307	if( (TESTBIT(pV,i))!=sqlite3BitvecTest(pBitvec,i) ){
55308	rc = i;
55309	break;
55310	}
55311	}
55312	}else{
55313	rc = 0;
55314	}
55315
55316	/* Free allocated structure */
55317	bitvec_end:
55318	sqlite3_free(pTmpSpace);
	@@ -58839,10 +58912,13 @@
58912	char pTmpSpace; / Pager.pageSize bytes of space for tmp use */
58913	PCache pPCache; / Pointer to page cache object */
58914	#ifndef SQLITE_OMIT_WAL
58915	Wal pWal; / Write-ahead log used by "journal_mode=wal" */
58916	char zWal; / File name for write-ahead log */
58917	#endif
58918	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
58919	sqlite3 *dbWal;
58920	#endif
58921	};
58922
58923	/*
58924	** Indexes for use with Pager.aStat[]. The Pager.aStat[] array contains
	@@ -65721,10 +65797,15 @@
65797	if( rc==SQLITE_OK ){
65798	rc = sqlite3WalOpen(pPager->pVfs,
65799	pPager->fd, pPager->zWal, pPager->exclusiveMode,
65800	pPager->journalSizeLimit, &pPager->pWal
65801	);
65802	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
65803	if( rc==SQLITE_OK ){
65804	sqlite3WalDb(pPager->pWal, pPager->dbWal);
65805	}
65806	#endif
65807	}
65808	pagerFixMaplimit(pPager);
65809
65810	return rc;
65811	}
	@@ -65840,10 +65921,11 @@
65921	/*
65922	** Set the database handle used by the wal layer to determine if
65923	** blocking locks are required.
65924	*/
65925	SQLITE_PRIVATE void sqlite3PagerWalDb(Pager pPager, sqlite3 db){
65926	pPager->dbWal = db;
65927	if( pagerUseWal(pPager) ){
65928	sqlite3WalDb(pPager->pWal, db);
65929	}
65930	}
65931	#endif
	@@ -69013,11 +69095,10 @@
69095	assert( rc==SQLITE_OK );
69096	if( pWal->bShmUnreliable==0 ){
69097	rc = walIndexReadHdr(pWal, pChanged);
69098	}
69099	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT

69100	if( rc==SQLITE_BUSY_TIMEOUT ){
69101	rc = SQLITE_BUSY;
69102	*pCnt \|= WAL_RETRY_BLOCKED_MASK;
69103	}
69104	#endif
	@@ -69028,10 +69109,11 @@
69109	** which might cause WAL_RETRY to be returned even if BUSY_RECOVERY
69110	** would be technically correct. But the race is benign since with
69111	** WAL_RETRY this routine will be called again and will probably be
69112	** right on the second iteration.
69113	*/
69114	(void)walEnableBlocking(pWal);
69115	if( pWal->apWiData[0]==0 ){
69116	/* This branch is taken when the xShmMap() method returns SQLITE_BUSY.
69117	** We assume this is a transient condition, so return WAL_RETRY. The
69118	** xShmMap() implementation used by the default unix and win32 VFS
69119	** modules may return SQLITE_BUSY due to a race condition in the
	@@ -69044,10 +69126,11 @@
69126	rc = WAL_RETRY;
69127	}else if( rc==SQLITE_BUSY ){
69128	rc = SQLITE_BUSY_RECOVERY;
69129	}
69130	}
69131	walDisableBlocking(pWal);
69132	if( rc!=SQLITE_OK ){
69133	return rc;
69134	}
69135	else if( pWal->bShmUnreliable ){
69136	return walBeginShmUnreliable(pWal, pChanged);
	@@ -69731,10 +69814,11 @@
69814	rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
69815	}
69816	if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
69817	}
69818	SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
69819	pWal->iReCksum = 0;
69820	}
69821	return rc;
69822	}
69823
69824	/*
	@@ -69778,10 +69862,13 @@
69862	pWal->hdr.aFrameCksum[1] = aWalData[2];
69863	SEH_TRY {
69864	walCleanupHash(pWal);
69865	}
69866	SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
69867	if( pWal->iReCksum>pWal->hdr.mxFrame ){
69868	pWal->iReCksum = 0;
69869	}
69870	}
69871
69872	return rc;
69873	}
69874
	@@ -72493,11 +72580,11 @@
72580	if( pKey ){
72581	KeyInfo *pKeyInfo = pCur->pKeyInfo;
72582	assert( nKey==(i64)(int)nKey );
72583	pIdxKey = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
72584	if( pIdxKey==0 ) return SQLITE_NOMEM_BKPT;
72585	sqlite3VdbeRecordUnpack((int)nKey, pKey, pIdxKey);
72586	if( pIdxKey->nField==0 \|\| pIdxKey->nField>pKeyInfo->nAllField ){
72587	rc = SQLITE_CORRUPT_BKPT;
72588	}else{
72589	rc = sqlite3BtreeIndexMoveto(pCur, pIdxKey, pRes);
72590	}
	@@ -73550,14 +73637,14 @@
73637	u8 pTmp; / Temporary ptr into data[] */
73638
73639	assert( pPage->pBt!=0 );
73640	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
73641	assert( CORRUPT_DB \|\| iStart>=pPage->hdrOffset+6+pPage->childPtrSize );
73642	assert( CORRUPT_DB \|\| iEnd <= (int)pPage->pBt->usableSize );
73643	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
73644	assert( iSize>=4 ); /* Minimum cell size is 4 */
73645	assert( CORRUPT_DB \|\| iStart<=(int)pPage->pBt->usableSize-4 );
73646
73647	/* The list of freeblocks must be in ascending order. Find the
73648	** spot on the list where iStart should be inserted.
73649	*/
73650	hdr = pPage->hdrOffset;
	@@ -74477,10 +74564,11 @@
74564	removed = 1;
74565	}
74566	sqlite3_mutex_leave(pMainMtx);
74567	return removed;
74568	#else
74569	UNUSED_PARAMETER( pBt );
74570	return 1;
74571	#endif
74572	}
74573
74574	/*
	@@ -74694,10 +74782,14 @@
74782	BtShared *pBt = p->pBt;
74783	assert( nReserve>=0 && nReserve<=255 );
74784	sqlite3BtreeEnter(p);
74785	pBt->nReserveWanted = (u8)nReserve;
74786	x = pBt->pageSize - pBt->usableSize;
74787	if( x==nReserve && (pageSize==0 \|\| (u32)pageSize==pBt->pageSize) ){
74788	sqlite3BtreeLeave(p);
74789	return SQLITE_OK;
74790	}
74791	if( nReserve<x ) nReserve = x;
74792	if( pBt->btsFlags & BTS_PAGESIZE_FIXED ){
74793	sqlite3BtreeLeave(p);
74794	return SQLITE_READONLY;
74795	}
	@@ -75318,10 +75410,17 @@
75410
75411	if( rc!=SQLITE_OK ){
75412	(void)sqlite3PagerWalWriteLock(pPager, 0);
75413	unlockBtreeIfUnused(pBt);
75414	}
75415	#if defined(SQLITE_ENABLE_SETLK_TIMEOUT)
75416	if( rc==SQLITE_BUSY_TIMEOUT ){
75417	/* If a blocking lock timed out, break out of the loop here so that
75418	** the busy-handler is not invoked. */
75419	break;
75420	}
75421	#endif
75422	}while( (rc&0xFF)==SQLITE_BUSY && pBt->inTransaction==TRANS_NONE &&
75423	btreeInvokeBusyHandler(pBt) );
75424	sqlite3PagerWalDb(pPager, 0);
75425	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
75426	if( rc==SQLITE_BUSY_TIMEOUT ) rc = SQLITE_BUSY;
	@@ -77275,10 +77374,34 @@
77374	*pRes = 1;
77375	rc = SQLITE_OK;
77376	}
77377	return rc;
77378	}
77379
77380	/* Set *pRes to 1 (true) if the BTree pointed to by cursor pCur contains zero
77381	** rows of content. Set *pRes to 0 (false) if the table contains content.
77382	** Return SQLITE_OK on success or some error code (ex: SQLITE_NOMEM) if
77383	** something goes wrong.
77384	*/
77385	SQLITE_PRIVATE int sqlite3BtreeIsEmpty(BtCursor pCur, int pRes){
77386	int rc;
77387
77388	assert( cursorOwnsBtShared(pCur) );
77389	assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
77390	if( pCur->eState==CURSOR_VALID ){
77391	*pRes = 0;
77392	return SQLITE_OK;
77393	}
77394	rc = moveToRoot(pCur);
77395	if( rc==SQLITE_EMPTY ){
77396	*pRes = 1;
77397	rc = SQLITE_OK;
77398	}else{
77399	*pRes = 0;
77400	}
77401	return rc;
77402	}
77403
77404	#ifdef SQLITE_DEBUG
77405	/* The cursors is CURSOR_VALID and has BTCF_AtLast set. Verify that
77406	** this flags are true for a consistent database.
77407	**
	@@ -77495,12 +77618,12 @@
77618	assert( (pCur->curFlags & BTCF_ValidOvfl)==0 );
77619	return rc;
77620	}
77621
77622	/*
77623	** Compare the "idx"-th cell on the page pPage against the key
77624	** pointing to by pIdxKey using xRecordCompare. Return negative or
77625	** zero if the cell is less than or equal pIdxKey. Return positive
77626	** if unknown.
77627	**
77628	** Return value negative: Cell at pCur[idx] less than pIdxKey
77629	**
	@@ -77511,16 +77634,15 @@
77634	**
77635	** This routine is part of an optimization. It is always safe to return
77636	** a positive value as that will cause the optimization to be skipped.
77637	*/
77638	static int indexCellCompare(
77639	MemPage *pPage,
77640	int idx,
77641	UnpackedRecord *pIdxKey,
77642	RecordCompare xRecordCompare
77643	){

77644	int c;
77645	int nCell; /* Size of the pCell cell in bytes */
77646	u8 *pCell = findCellPastPtr(pPage, idx);
77647
77648	nCell = pCell[0];
	@@ -77625,18 +77747,18 @@
77747	&& pCur->pPage->leaf
77748	&& cursorOnLastPage(pCur)
77749	){
77750	int c;
77751	if( pCur->ix==pCur->pPage->nCell-1
77752	&& (c = indexCellCompare(pCur->pPage,pCur->ix,pIdxKey,xRecordCompare))<=0
77753	&& pIdxKey->errCode==SQLITE_OK
77754	){
77755	*pRes = c;
77756	return SQLITE_OK; /* Cursor already pointing at the correct spot */
77757	}
77758	if( pCur->iPage>0
77759	&& indexCellCompare(pCur->pPage, 0, pIdxKey, xRecordCompare)<=0
77760	&& pIdxKey->errCode==SQLITE_OK
77761	){
77762	pCur->curFlags &= ~(BTCF_ValidOvfl\|BTCF_AtLast);
77763	if( !pCur->pPage->isInit ){
77764	return SQLITE_CORRUPT_BKPT;
	@@ -77849,11 +77971,11 @@
77971	if( pCur->eState!=CURSOR_VALID ) return 0;
77972	if( NEVER(pCur->pPage->leaf==0) ) return -1;
77973
77974	n = pCur->pPage->nCell;
77975	for(i=0; i<pCur->iPage; i++){
77976	n *= pCur->apPage[i]->nCell+1;
77977	}
77978	return n;
77979	}
77980
77981	/*
	@@ -80306,11 +80428,16 @@
80428
80429	/* If the sibling pages are not leaves, ensure that the right-child pointer
80430	** of the right-most new sibling page is set to the value that was
80431	** originally in the same field of the right-most old sibling page. */
80432	if( (pageFlags & PTF_LEAF)==0 && nOld!=nNew ){
80433	MemPage *pOld;
80434	if( nNew>nOld ){
80435	pOld = apNew[nOld-1];
80436	}else{
80437	pOld = apOld[nOld-1];
80438	}
80439	memcpy(&apNew[nNew-1]->aData[8], &pOld->aData[8], 4);
80440	}
80441
80442	/* Make any required updates to pointer map entries associated with
80443	** cells stored on sibling pages following the balance operation. Pointer
	@@ -82938,10 +83065,11 @@
83065	** btree as the argument handle holds an exclusive lock on the
83066	** sqlite_schema table. Otherwise SQLITE_OK.
83067	*/
83068	SQLITE_PRIVATE int sqlite3BtreeSchemaLocked(Btree *p){
83069	int rc;
83070	UNUSED_PARAMETER(p); /* only used in DEBUG builds */
83071	assert( sqlite3_mutex_held(p->db->mutex) );
83072	sqlite3BtreeEnter(p);
83073	rc = querySharedCacheTableLock(p, SCHEMA_ROOT, READ_LOCK);
83074	assert( rc==SQLITE_OK \|\| rc==SQLITE_LOCKED_SHAREDCACHE );
83075	sqlite3BtreeLeave(p);
	@@ -87262,10 +87390,13 @@
87390	** into register iDest, then add the OPFLAG_TYPEOFARG flag to that
87391	** opcode.
87392	*/
87393	SQLITE_PRIVATE void sqlite3VdbeTypeofColumn(Vdbe *p, int iDest){
87394	VdbeOp *pOp = sqlite3VdbeGetLastOp(p);
87395	#ifdef SQLITE_DEBUG
87396	while( pOp->opcode==OP_ReleaseReg ) pOp--;
87397	#endif
87398	if( pOp->p3==iDest && pOp->opcode==OP_Column ){
87399	pOp->p5 \|= OPFLAG_TYPEOFARG;
87400	}
87401	}
87402
	@@ -90155,34 +90286,26 @@
90286	}
90287	}
90288	return;
90289	}
90290	/*
90291	** Allocate sufficient space for an UnpackedRecord structure large enough
90292	** to hold a decoded index record for pKeyInfo.
90293	**
90294	** The space is allocated using sqlite3DbMallocRaw(). If an OOM error
90295	** occurs, NULL is returned.







90296	*/
90297	SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(
90298	KeyInfo pKeyInfo / Description of the record */
90299	){
90300	UnpackedRecord p; / Unpacked record to return */
90301	u64 nByte; /* Number of bytes required for p /
90302	assert( sizeof(UnpackedRecord) + sizeof(Mem)*65536 < 0x7fffffff );
90303	nByte = ROUND8P(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1);
90304	p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte);
90305	if( !p ) return 0;
90306	p->aMem = (Mem)&((char)p)[ROUND8P(sizeof(UnpackedRecord))];

90307	p->pKeyInfo = pKeyInfo;
90308	p->nField = pKeyInfo->nKeyField + 1;
90309	return p;
90310	}
90311
	@@ -90190,11 +90313,10 @@
90313	** Given the nKey-byte encoding of a record in pKey[], populate the
90314	** UnpackedRecord structure indicated by the fourth argument with the
90315	** contents of the decoded record.
90316	*/
90317	SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(

90318	int nKey, /* Size of the binary record */
90319	const void pKey, / The binary record */
90320	UnpackedRecord p / Populate this structure before returning. */
90321	){
90322	const unsigned char aKey = (const unsigned char )pKey;
	@@ -90201,10 +90323,11 @@
90323	u32 d;
90324	u32 idx; /* Offset in aKey[] to read from */
90325	u16 u; /* Unsigned loop counter */
90326	u32 szHdr;
90327	Mem *pMem = p->aMem;
90328	KeyInfo *pKeyInfo = p->pKeyInfo;
90329
90330	p->default_rc = 0;
90331	assert( EIGHT_BYTE_ALIGNMENT(pMem) );
90332	idx = getVarint32(aKey, szHdr);
90333	d = szHdr;
	@@ -90228,10 +90351,12 @@
90351	/* In a corrupt record entry, the last pMem might have been set up using
90352	** uninitialized memory. Overwrite its value with NULL, to prevent
90353	** warnings from MSAN. */
90354	sqlite3VdbeMemSetNull(pMem-1);
90355	}
90356	testcase( u == pKeyInfo->nKeyField + 1 );
90357	testcase( u < pKeyInfo->nKeyField + 1 );
90358	assert( u<=pKeyInfo->nKeyField + 1 );
90359	p->nField = u;
90360	}
90361
90362	#ifdef SQLITE_DEBUG
	@@ -91087,10 +91212,11 @@
91212	** is an integer.
91213	**
91214	** The easiest way to enforce this limit is to consider only records with
91215	** 13 fields or less. If the first field is an integer, the maximum legal
91216	** header size is (125 + 1 + 1) bytes. /
91217	assert( p->pKeyInfo->aSortFlags!=0 );
91218	if( p->pKeyInfo->nAllField<=13 ){
91219	int flags = p->aMem[0].flags;
91220	if( p->pKeyInfo->aSortFlags[0] ){
91221	if( p->pKeyInfo->aSortFlags[0] & KEYINFO_ORDER_BIGNULL ){
91222	return sqlite3VdbeRecordCompare;
	@@ -91336,10 +91462,11 @@
91462	}else{
91463	v->expmask \|= ((u32)1 << (iVar-1));
91464	}
91465	}
91466
91467	#ifndef SQLITE_OMIT_DATETIME_FUNCS
91468	/*
91469	** Cause a function to throw an error if it was call from OP_PureFunc
91470	** rather than OP_Function.
91471	**
91472	** OP_PureFunc means that the function must be deterministic, and should
	@@ -91369,10 +91496,11 @@
91496	sqlite3_free(zMsg);
91497	return 0;
91498	}
91499	return 1;
91500	}
91501	#endif /* SQLITE_OMIT_DATETIME_FUNCS */
91502
91503	#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
91504	/*
91505	** This Walker callback is used to help verify that calls to
91506	** sqlite3BtreeCursorHint() with opcode BTREE_HINT_RANGE have
	@@ -91445,11 +91573,10 @@
91573	){
91574	sqlite3 *db = v->db;
91575	i64 iKey2;
91576	PreUpdate preupdate;
91577	const char *zTbl = pTab->zName;

91578	#ifdef SQLITE_DEBUG
91579	int nRealCol;
91580	if( pTab->tabFlags & TF_WithoutRowid ){
91581	nRealCol = sqlite3PrimaryKeyIndex(pTab)->nColumn;
91582	}else if( pTab->tabFlags & TF_HasVirtual ){
	@@ -91484,11 +91611,11 @@
91611	preupdate.iNewReg = iReg;
91612	preupdate.pKeyinfo = (KeyInfo*)&preupdate.keyinfoSpace;
91613	preupdate.pKeyinfo->db = db;
91614	preupdate.pKeyinfo->enc = ENC(db);
91615	preupdate.pKeyinfo->nKeyField = pTab->nCol;
91616	preupdate.pKeyinfo->aSortFlags = 0; /* Indicate .aColl, .nAllField uninit */
91617	preupdate.iKey1 = iKey1;
91618	preupdate.iKey2 = iKey2;
91619	preupdate.pTab = pTab;
91620	preupdate.iBlobWrite = iBlobWrite;
91621
	@@ -93681,11 +93808,11 @@
93808	UnpackedRecord pRet; / Return value */
93809
93810	pRet = sqlite3VdbeAllocUnpackedRecord(pKeyInfo);
93811	if( pRet ){
93812	memset(pRet->aMem, 0, sizeof(Mem)*(pKeyInfo->nKeyField+1));
93813	sqlite3VdbeRecordUnpack(nKey, pKey, pRet);
93814	}
93815	return pRet;
93816	}
93817
93818	/*
	@@ -93710,10 +93837,13 @@
93837	rc = SQLITE_MISUSE_BKPT;
93838	goto preupdate_old_out;
93839	}
93840	if( p->pPk ){
93841	iStore = sqlite3TableColumnToIndex(p->pPk, iIdx);
93842	}else if( iIdx >= p->pTab->nCol ){
93843	rc = SQLITE_MISUSE_BKPT;
93844	goto preupdate_old_out;
93845	}else{
93846	iStore = sqlite3TableColumnToStorage(p->pTab, iIdx);
93847	}
93848	if( iStore>=p->pCsr->nField \|\| iStore<0 ){
93849	rc = SQLITE_RANGE;
	@@ -93865,10 +93995,12 @@
93995	rc = SQLITE_MISUSE_BKPT;
93996	goto preupdate_new_out;
93997	}
93998	if( p->pPk && p->op!=SQLITE_UPDATE ){
93999	iStore = sqlite3TableColumnToIndex(p->pPk, iIdx);
94000	}else if( iIdx >= p->pTab->nCol ){
94001	return SQLITE_MISUSE_BKPT;
94002	}else{
94003	iStore = sqlite3TableColumnToStorage(p->pTab, iIdx);
94004	}
94005
94006	if( iStore>=p->pCsr->nField \|\| iStore<0 ){
	@@ -95190,10 +95322,40 @@
95322	}
95323	pDest->flags &= ~MEM_Ephem;
95324	return rc;
95325	}
95326
95327	/*
95328	** Send a "statement aborts" message to the error log.
95329	*/
95330	static SQLITE_NOINLINE void sqlite3VdbeLogAbort(
95331	Vdbe p, / The statement that is running at the time of failure */
95332	int rc, /* Error code */
95333	Op pOp, / Opcode that filed */
95334	Op aOp / All opcodes */
95335	){
95336	const char zSql = p->zSql; / Original SQL text */
95337	const char zPrefix = ""; / Prefix added to SQL text */
95338	int pc; /* Opcode address */
95339	char zXtra[100]; /* Buffer space to store zPrefix */
95340
95341	if( p->pFrame ){
95342	assert( aOp[0].opcode==OP_Init );
95343	if( aOp[0].p4.z!=0 ){
95344	assert( aOp[0].p4.z[0]=='-'
95345	&& aOp[0].p4.z[1]=='-'
95346	&& aOp[0].p4.z[2]==' ' );
95347	sqlite3_snprintf(sizeof(zXtra), zXtra,"/* %s */ ",aOp[0].p4.z+3);
95348	zPrefix = zXtra;
95349	}else{
95350	zPrefix = "/* unknown trigger */ ";
95351	}
95352	}
95353	pc = (int)(pOp - aOp);
95354	sqlite3_log(rc, "statement aborts at %d: %s; [%s%s]",
95355	pc, p->zErrMsg, zPrefix, zSql);
95356	}
95357
95358	/*
95359	** Return the symbolic name for the data type of a pMem
95360	*/
95361	static const char vdbeMemTypeName(Mem pMem){
	@@ -95715,12 +95877,11 @@
95877	p->zErrMsg = sqlite3MPrintf(db, "%z: %s", p->zErrMsg, pOp->p4.z);
95878	}
95879	}else{
95880	sqlite3VdbeError(p, "%s", pOp->p4.z);
95881	}
95882	sqlite3VdbeLogAbort(p, pOp->p1, pOp, aOp);

95883	}
95884	rc = sqlite3VdbeHalt(p);
95885	assert( rc==SQLITE_BUSY \|\| rc==SQLITE_OK \|\| rc==SQLITE_ERROR );
95886	if( rc==SQLITE_BUSY ){
95887	p->rc = SQLITE_BUSY;
	@@ -96874,10 +97035,11 @@
97035	}
97036	n = pOp->p3;
97037	pKeyInfo = pOp->p4.pKeyInfo;
97038	assert( n>0 );
97039	assert( pKeyInfo!=0 );
97040	assert( pKeyInfo->aSortFlags!=0 );
97041	p1 = pOp->p1;
97042	p2 = pOp->p2;
97043	#ifdef SQLITE_DEBUG
97044	if( aPermute ){
97045	int k, mx = 0;
	@@ -97042,11 +97204,11 @@
97204	pOut->u.i = ~sqlite3VdbeIntValue(pIn1);
97205	}
97206	break;
97207	}
97208
97209	/* Opcode: Once P1 P2 P3 * *
97210	**
97211	** Fall through to the next instruction the first time this opcode is
97212	** encountered on each invocation of the byte-code program. Jump to P2
97213	** on the second and all subsequent encounters during the same invocation.
97214	**
	@@ -97058,10 +97220,16 @@
97220	**
97221	** For subprograms, there is a bitmask in the VdbeFrame that determines
97222	** whether or not the jump should be taken. The bitmask is necessary
97223	** because the self-altering code trick does not work for recursive
97224	** triggers.
97225	**
97226	** The P3 operand is not used directly by this opcode. However P3 is
97227	** used by the code generator as follows: If this opcode is the start
97228	** of a subroutine and that subroutine uses a Bloom filter, then P3 will
97229	** be the register that holds that Bloom filter. See tag-202407032019
97230	** in the source code for implementation details.
97231	*/
97232	case OP_Once: { /* jump */
97233	u32 iAddr; /* Address of this instruction */
97234	assert( p->aOp[0].opcode==OP_Init );
97235	if( p->pFrame ){
	@@ -97629,10 +97797,19 @@
97797	** Synopsis: typecheck(r[P1@P2])
97798	**
97799	** Apply affinities to the range of P2 registers beginning with P1.
97800	** Take the affinities from the Table object in P4. If any value
97801	** cannot be coerced into the correct type, then raise an error.
97802	**
97803	** If P3==0, then omit checking of VIRTUAL columns.
97804	**
97805	** If P3==1, then omit checking of all generated column, both VIRTUAL
97806	** and STORED.
97807	**
97808	** If P3>=2, then only check column number P3-2 in the table (which will
97809	** be a VIRTUAL column) against the value in reg[P1]. In this case,
97810	** P2 will be 1.
97811	**
97812	** This opcode is similar to OP_Affinity except that this opcode
97813	** forces the register type to the Table column type. This is used
97814	** to implement "strict affinity".
97815	**
	@@ -97643,30 +97820,42 @@
97820	**
97821	** Preconditions:
97822	**
97823	** <ul>
97824	** <li> P2 should be the number of non-virtual columns in the
97825	** table of P4 unless P3>1, in which case P2 will be 1.
97826	** <li> Table P4 is a STRICT table.
97827	** </ul>
97828	**
97829	** If any precondition is false, an assertion fault occurs.
97830	*/
97831	case OP_TypeCheck: {
97832	Table *pTab;
97833	Column *aCol;
97834	int i;
97835	int nCol;
97836
97837	assert( pOp->p4type==P4_TABLE );
97838	pTab = pOp->p4.pTab;
97839	assert( pTab->tabFlags & TF_Strict );
97840	assert( pOp->p3>=0 && pOp->p3<pTab->nCol+2 );
97841	aCol = pTab->aCol;
97842	pIn1 = &aMem[pOp->p1];
97843	if( pOp->p3<2 ){
97844	assert( pTab->nNVCol==pOp->p2 );
97845	i = 0;
97846	nCol = pTab->nCol;
97847	}else{
97848	i = pOp->p3-2;
97849	nCol = i+1;
97850	assert( i<pTab->nCol );
97851	assert( aCol[i].colFlags & COLFLAG_VIRTUAL );
97852	assert( pOp->p2==1 );
97853	}
97854	for(; i<nCol; i++){
97855	if( (aCol[i].colFlags & COLFLAG_GENERATED)!=0 && pOp->p3<2 ){
97856	if( (aCol[i].colFlags & COLFLAG_VIRTUAL)!=0 ) continue;
97857	if( pOp->p3 ){ pIn1++; continue; }
97858	}
97859	assert( pIn1 < &aMem[pOp->p1+pOp->p2] );
97860	applyAffinity(pIn1, aCol[i].affinity, encoding);
97861	if( (pIn1->flags & MEM_Null)==0 ){
	@@ -98103,10 +98292,11 @@
98292	}
98293	}else{
98294	zHdr += sqlite3PutVarint(zHdr, serial_type);
98295	if( pRec->n ){
98296	assert( pRec->z!=0 );
98297	assert( pRec->z!=(const char*)sqlite3CtypeMap );
98298	memcpy(zPayload, pRec->z, pRec->n);
98299	zPayload += pRec->n;
98300	}
98301	}
98302	if( pRec==pLast ) break;
	@@ -99740,11 +99930,11 @@
99930	rc = ExpandBlob(r.aMem);
99931	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
99932	if( rc ) goto no_mem;
99933	pIdxKey = sqlite3VdbeAllocUnpackedRecord(pC->pKeyInfo);
99934	if( pIdxKey==0 ) goto no_mem;
99935	sqlite3VdbeRecordUnpack(r.aMem->n, r.aMem->z, pIdxKey);
99936	pIdxKey->default_rc = 0;
99937	rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, pIdxKey, &pC->seekResult);
99938	sqlite3DbFreeNN(db, pIdxKey);
99939	}
99940	if( rc!=SQLITE_OK ){
	@@ -100737,10 +100927,36 @@
100927	VdbeBranchTaken(res!=0,2);
100928	if( res ) goto jump_to_p2;
100929	}
100930	break;
100931	}
100932
100933	/* Opcode: IfEmpty P1 P2 * * *
100934	** Synopsis: if( empty(P1) ) goto P2
100935	**
100936	** Check to see if the b-tree table that cursor P1 references is empty
100937	** and jump to P2 if it is.
100938	*/
100939	case OP_IfEmpty: { /* jump */
100940	VdbeCursor *pC;
100941	BtCursor *pCrsr;
100942	int res;
100943
100944	assert( pOp->p1>=0 && pOp->p1<p->nCursor );
100945	assert( pOp->p2>=0 && pOp->p2<p->nOp );
100946
100947	pC = p->apCsr[pOp->p1];
100948	assert( pC!=0 );
100949	assert( pC->eCurType==CURTYPE_BTREE );
100950	pCrsr = pC->uc.pCursor;
100951	assert( pCrsr );
100952	rc = sqlite3BtreeIsEmpty(pCrsr, &res);
100953	if( rc ) goto abort_due_to_error;
100954	VdbeBranchTaken(res!=0,2);
100955	if( res ) goto jump_to_p2;
100956	break;
100957	}
100958
100959	/* Opcode: Next P1 P2 P3 * P5
100960	**
100961	** Advance cursor P1 so that it points to the next key/data pair in its
100962	** table or index. If there are no more key/value pairs then fall through
	@@ -102609,11 +102825,18 @@
102825	sqlite3_vtab_cursor *pVCur;
102826	sqlite3_vtab *pVtab;
102827	const sqlite3_module *pModule;
102828
102829	assert( p->bIsReader );
102830	pCur = p->apCsr[pOp->p1];
102831	if( pCur!=0
102832	&& ALWAYS( pCur->eCurType==CURTYPE_VTAB )
102833	&& ALWAYS( pCur->uc.pVCur->pVtab==pOp->p4.pVtab->pVtab )
102834	){
102835	/* This opcode is a no-op if the cursor is already open */
102836	break;
102837	}
102838	pVCur = 0;
102839	pVtab = pOp->p4.pVtab->pVtab;
102840	if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
102841	rc = SQLITE_LOCKED;
102842	goto abort_due_to_error;
	@@ -103551,12 +103774,11 @@
103774	sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc));
103775	}
103776	p->rc = rc;
103777	sqlite3SystemError(db, rc);
103778	testcase( sqlite3GlobalConfig.xLog!=0 );
103779	sqlite3VdbeLogAbort(p, rc, pOp, aOp);

103780	if( p->eVdbeState==VDBE_RUN_STATE ) sqlite3VdbeHalt(p);
103781	if( rc==SQLITE_IOERR_NOMEM ) sqlite3OomFault(db);
103782	if( rc==SQLITE_CORRUPT && db->autoCommit==0 ){
103783	db->flags \|= SQLITE_CorruptRdOnly;
103784	}
	@@ -104013,11 +104235,11 @@
104235	void *z,
104236	int n,
104237	int iOffset,
104238	int (xCall)(BtCursor, u32, u32, void*)
104239	){
104240	int rc = SQLITE_OK;
104241	Incrblob p = (Incrblob )pBlob;
104242	Vdbe *v;
104243	sqlite3 *db;
104244
104245	if( p==0 ) return SQLITE_MISUSE_BKPT;
	@@ -104053,21 +104275,36 @@
104275	** same way as an SQLITE_DELETE (the SQLITE_DELETE code is actually
104276	** slightly more efficient). Since you cannot write to a PK column
104277	** using the incremental-blob API, this works. For the sessions module
104278	** anyhow.
104279	*/
104280	if( sqlite3BtreeCursorIsValidNN(p->pCsr)==0 ){
104281	/* If the cursor is not currently valid, try to reseek it. This
104282	** always either fails or finds the correct row - the cursor will
104283	** have been marked permanently CURSOR_INVALID if the open row has
104284	** been deleted. */
104285	int bDiff = 0;
104286	rc = sqlite3BtreeCursorRestore(p->pCsr, &bDiff);
104287	assert( bDiff==0 \|\| sqlite3BtreeCursorIsValidNN(p->pCsr)==0 );
104288	}
104289	if( sqlite3BtreeCursorIsValidNN(p->pCsr) ){
104290	sqlite3_int64 iKey;
104291	iKey = sqlite3BtreeIntegerKey(p->pCsr);
104292	assert( v->apCsr[0]!=0 );
104293	assert( v->apCsr[0]->eCurType==CURTYPE_BTREE );
104294	sqlite3VdbePreUpdateHook(
104295	v, v->apCsr[0], SQLITE_DELETE, p->zDb, p->pTab, iKey, -1, p->iCol
104296	);
104297	}
104298	}
104299	if( rc==SQLITE_OK ){
104300	rc = xCall(p->pCsr, iOffset+p->iOffset, n, z);
104301	}
104302	#else
104303	rc = xCall(p->pCsr, iOffset+p->iOffset, n, z);
104304	#endif
104305
104306	sqlite3BtreeLeaveCursor(p->pCsr);
104307	if( rc==SQLITE_ABORT ){
104308	sqlite3VdbeFinalize(v);
104309	p->pStmt = 0;
104310	}else{
	@@ -104916,11 +105153,11 @@
105153	const void pKey1, int nKey1, / Left side of comparison */
105154	const void pKey2, int nKey2 / Right side of comparison */
105155	){
105156	UnpackedRecord *r2 = pTask->pUnpacked;
105157	if( *pbKey2Cached==0 ){
105158	sqlite3VdbeRecordUnpack(nKey2, pKey2, r2);
105159	*pbKey2Cached = 1;
105160	}
105161	return sqlite3VdbeRecordCompareWithSkip(nKey1, pKey1, r2, 1);
105162	}
105163
	@@ -104943,11 +105180,11 @@
105180	const void pKey1, int nKey1, / Left side of comparison */
105181	const void pKey2, int nKey2 / Right side of comparison */
105182	){
105183	UnpackedRecord *r2 = pTask->pUnpacked;
105184	if( !*pbKey2Cached ){
105185	sqlite3VdbeRecordUnpack(nKey2, pKey2, r2);
105186	*pbKey2Cached = 1;
105187	}
105188	return sqlite3VdbeRecordCompare(nKey1, pKey1, r2);
105189	}
105190
	@@ -104983,10 +105220,11 @@
105220	res = vdbeSorterCompareTail(
105221	pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
105222	);
105223	}
105224	}else{
105225	assert( pTask->pSorter->pKeyInfo->aSortFlags!=0 );
105226	assert( !(pTask->pSorter->pKeyInfo->aSortFlags[0]&KEYINFO_ORDER_BIGNULL) );
105227	if( pTask->pSorter->pKeyInfo->aSortFlags[0] ){
105228	res = res * -1;
105229	}
105230	}
	@@ -105046,10 +105284,11 @@
105284	}else{
105285	if( *v2 & 0x80 ) res = +1;
105286	}
105287	}
105288
105289	assert( pTask->pSorter->pKeyInfo->aSortFlags!=0 );
105290	if( res==0 ){
105291	if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
105292	res = vdbeSorterCompareTail(
105293	pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
105294	);
	@@ -105119,11 +105358,12 @@
105358	assert( pCsr->pKeyInfo );
105359	assert( !pCsr->isEphemeral );
105360	assert( pCsr->eCurType==CURTYPE_SORTER );
105361	assert( sizeof(KeyInfo) + UMXV(pCsr->pKeyInfo->nKeyField)sizeof(CollSeq)
105362	< 0x7fffffff );
105363	assert( pCsr->pKeyInfo->nKeyField<=pCsr->pKeyInfo->nAllField );
105364	szKeyInfo = SZ_KEYINFO(pCsr->pKeyInfo->nAllField);
105365	sz = SZ_VDBESORTER(nWorker+1);
105366
105367	pSorter = (VdbeSorter*)sqlite3DbMallocZero(db, sz + szKeyInfo);
105368	pCsr->uc.pSorter = pSorter;
105369	if( pSorter==0 ){
	@@ -105133,11 +105373,16 @@
105373	pSorter->pKeyInfo = pKeyInfo = (KeyInfo)((u8)pSorter + sz);
105374	memcpy(pKeyInfo, pCsr->pKeyInfo, szKeyInfo);
105375	pKeyInfo->db = 0;
105376	if( nField && nWorker==0 ){
105377	pKeyInfo->nKeyField = nField;
105378	assert( nField<=pCsr->pKeyInfo->nAllField );
105379	}
105380	/* It is OK that pKeyInfo reuses the aSortFlags field from pCsr->pKeyInfo,
105381	** since the pCsr->pKeyInfo->aSortFlags[] array is invariant and lives
105382	** longer that pSorter. */
105383	assert( pKeyInfo->aSortFlags==pCsr->pKeyInfo->aSortFlags );
105384	sqlite3BtreeEnter(pBt);
105385	pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(pBt);
105386	sqlite3BtreeLeave(pBt);
105387	pSorter->nTask = nWorker + 1;
105388	pSorter->iPrev = (u8)(nWorker - 1);
	@@ -106913,11 +107158,11 @@
107158	r2->nField = nKeyCol;
107159	}
107160	assert( r2->nField==nKeyCol );
107161
107162	pKey = vdbeSorterRowkey(pSorter, &nKey);
107163	sqlite3VdbeRecordUnpack(nKey, pKey, r2);
107164	for(i=0; i<nKeyCol; i++){
107165	if( r2->aMem[i].flags & MEM_Null ){
107166	*pRes = -1;
107167	return SQLITE_OK;
107168	}
	@@ -109287,17 +109532,16 @@
109532	/* Clearly non-deterministic functions like random(), but also
109533	** date/time functions that use 'now', and other functions like
109534	** sqlite_version() that might change over time cannot be used
109535	** in an index or generated column. Curiously, they can be used
109536	** in a CHECK constraint. SQLServer, MySQL, and PostgreSQL all
109537	** allow this. */
109538	sqlite3ResolveNotValid(pParse, pNC, "non-deterministic functions",
109539	NC_IdxExpr\|NC_PartIdx\|NC_GenCol, 0, pExpr);
109540	}else{
109541	assert( (NC_SelfRef & 0xff)==NC_SelfRef ); /* Must fit in 8 bits */
109542	pExpr->op2 = pNC->ncFlags & NC_SelfRef;

109543	}
109544	if( (pDef->funcFlags & SQLITE_FUNC_INTERNAL)!=0
109545	&& pParse->nested==0
109546	&& (pParse->db->mDbFlags & DBFLAG_InternalFunc)==0
109547	){
	@@ -109309,10 +109553,11 @@
109553	pDef = 0;
109554	}else
109555	if( (pDef->funcFlags & (SQLITE_FUNC_DIRECT\|SQLITE_FUNC_UNSAFE))!=0
109556	&& !IN_RENAME_OBJECT
109557	){
109558	if( pNC->ncFlags & NC_FromDDL ) ExprSetProperty(pExpr, EP_FromDDL);
109559	sqlite3ExprFunctionUsable(pParse, pExpr, pDef);
109560	}
109561	}
109562
109563	if( 0==IN_RENAME_OBJECT ){
	@@ -109443,22 +109688,25 @@
109688	** type of the function
109689	*/
109690	return WRC_Prune;
109691	}
109692	#ifndef SQLITE_OMIT_SUBQUERY
109693	case TK_EXISTS:
109694	case TK_SELECT:

109695	#endif
109696	case TK_IN: {
109697	testcase( pExpr->op==TK_IN );
109698	testcase( pExpr->op==TK_EXISTS );
109699	testcase( pExpr->op==TK_SELECT );
109700	if( ExprUseXSelect(pExpr) ){
109701	int nRef = pNC->nRef;
109702	testcase( pNC->ncFlags & NC_IsCheck );
109703	testcase( pNC->ncFlags & NC_PartIdx );
109704	testcase( pNC->ncFlags & NC_IdxExpr );
109705	testcase( pNC->ncFlags & NC_GenCol );
109706	assert( pExpr->x.pSelect );
109707	if( pExpr->op==TK_EXISTS ) pParse->bHasExists = 1;
109708	if( pNC->ncFlags & NC_SelfRef ){
109709	notValidImpl(pParse, pNC, "subqueries", pExpr, pExpr);
109710	}else{
109711	sqlite3WalkSelect(pWalker, pExpr->x.pSelect);
109712	}
	@@ -110469,11 +110717,13 @@
110717	assert( pExpr->iTable==pExpr->pLeft->x.pSelect->pEList->nExpr );
110718	return sqlite3ExprAffinity(
110719	pExpr->pLeft->x.pSelect->pEList->a[pExpr->iColumn].pExpr
110720	);
110721	}
110722	if( op==TK_VECTOR
110723	\|\| (op==TK_FUNCTION && pExpr->affExpr==SQLITE_AFF_DEFER)
110724	){
110725	assert( ExprUseXList(pExpr) );
110726	return sqlite3ExprAffinity(pExpr->x.pList->a[0].pExpr);
110727	}
110728	if( ExprHasProperty(pExpr, EP_Skip\|EP_IfNullRow) ){
110729	assert( pExpr->op==TK_COLLATE
	@@ -110662,11 +110912,13 @@
110912	}
110913	if( op==TK_CAST \|\| op==TK_UPLUS ){
110914	p = p->pLeft;
110915	continue;
110916	}
110917	if( op==TK_VECTOR
110918	\|\| (op==TK_FUNCTION && p->affExpr==SQLITE_AFF_DEFER)
110919	){
110920	assert( ExprUseXList(p) );
110921	p = p->x.pList->a[0].pExpr;
110922	continue;
110923	}
110924	if( op==TK_COLLATE ){
	@@ -111536,11 +111788,11 @@
111788	return pRight;
111789	}else if( pRight==0 ){
111790	return pLeft;
111791	}else{
111792	u32 f = pLeft->flags \| pRight->flags;
111793	if( (f&(EP_OuterON\|EP_InnerON\|EP_IsFalse\|EP_HasFunc))==EP_IsFalse
111794	&& !IN_RENAME_OBJECT
111795	){
111796	sqlite3ExprDeferredDelete(pParse, pLeft);
111797	sqlite3ExprDeferredDelete(pParse, pRight);
111798	return sqlite3Expr(db, TK_INTEGER, "0");
	@@ -112764,10 +113016,90 @@
113016	pExpr = pExpr->op==TK_AND ? pLeft : pRight;
113017	}
113018	}
113019	return pExpr;
113020	}
113021
113022	/*
113023	** Return true if it might be advantageous to compute the right operand
113024	** of expression pExpr first, before the left operand.
113025	**
113026	** Normally the left operand is computed before the right operand. But if
113027	** the left operand contains a subquery and the right does not, then it
113028	** might be more efficient to compute the right operand first.
113029	*/
113030	static int exprEvalRhsFirst(Expr *pExpr){
113031	if( ExprHasProperty(pExpr->pLeft, EP_Subquery)
113032	&& !ExprHasProperty(pExpr->pRight, EP_Subquery)
113033	){
113034	return 1;
113035	}else{
113036	return 0;
113037	}
113038	}
113039
113040	/*
113041	** Compute the two operands of a binary operator.
113042	**
113043	** If either operand contains a subquery, then the code strives to
113044	** compute the operand containing the subquery second. If the other
113045	** operand evalutes to NULL, then a jump is made. The address of the
113046	** IsNull operand that does this jump is returned. The caller can use
113047	** this to optimize the computation so as to avoid doing the potentially
113048	** expensive subquery.
113049	**
113050	** If no optimization opportunities exist, return 0.
113051	*/
113052	static int exprComputeOperands(
113053	Parse pParse, / Parsing context */
113054	Expr pExpr, / The comparison expression */
113055	int pR1, / OUT: Register holding the left operand */
113056	int pR2, / OUT: Register holding the right operand */
113057	int pFree1, / OUT: Temp register to free if not zero */
113058	int pFree2 / OUT: Another temp register to free if not zero */
113059	){
113060	int addrIsNull;
113061	int r1, r2;
113062	Vdbe *v = pParse->pVdbe;
113063
113064	assert( v!=0 );
113065	/*
113066	** If the left operand contains a (possibly expensive) subquery and the
113067	** right operand does not and the right operation might be NULL,
113068	** then compute the right operand first and do an IsNull jump if the
113069	** right operand evalutes to NULL.
113070	*/
113071	if( exprEvalRhsFirst(pExpr) && sqlite3ExprCanBeNull(pExpr->pRight) ){
113072	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, pFree2);
113073	addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r2);
113074	VdbeComment((v, "skip left operand"));
113075	VdbeCoverage(v);
113076	}else{
113077	r2 = 0; /* Silence a false-positive uninit-var warning in MSVC */
113078	addrIsNull = 0;
113079	}
113080	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, pFree1);
113081	if( addrIsNull==0 ){
113082	/*
113083	** If the right operand contains a subquery and the left operand does not
113084	** and the left operand might be NULL, then check the left operand do
113085	** an IsNull check on the left operand before computing the right
113086	** operand.
113087	*/
113088	if( ExprHasProperty(pExpr->pRight, EP_Subquery)
113089	&& sqlite3ExprCanBeNull(pExpr->pLeft)
113090	){
113091	addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, r1);
113092	VdbeComment((v, "skip right operand"));
113093	VdbeCoverage(v);
113094	}
113095	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, pFree2);
113096	}
113097	*pR1 = r1;
113098	*pR2 = r2;
113099	return addrIsNull;
113100	}
113101
113102	/*
113103	** pExpr is a TK_FUNCTION node. Try to determine whether or not the
113104	** function is a constant function. A function is constant if all of
113105	** the following are true:
	@@ -114022,15 +114354,16 @@
114354	pCopy = sqlite3SelectDup(pParse->db, pSelect, 0);
114355	rc = pParse->db->mallocFailed ? 1 :sqlite3Select(pParse, pCopy, &dest);
114356	sqlite3SelectDelete(pParse->db, pCopy);
114357	sqlite3DbFree(pParse->db, dest.zAffSdst);
114358	if( addrBloom ){
114359	/* Remember that location of the Bloom filter in the P3 operand
114360	** of the OP_Once that began this subroutine. tag-202407032019 */
114361	sqlite3VdbeGetOp(v, addrOnce)->p3 = dest.iSDParm2;
114362	if( dest.iSDParm2==0 ){
114363	/* If the Bloom filter won't actually be used, keep it small */
114364	sqlite3VdbeGetOp(v, addrBloom)->p1 = 10;

114365	}
114366	}
114367	if( rc ){
114368	sqlite3KeyInfoUnref(pKeyInfo);
114369	return;
	@@ -114208,21 +114541,27 @@
114541	dest.eDest = SRT_Exists;
114542	sqlite3VdbeAddOp2(v, OP_Integer, 0, dest.iSDParm);
114543	VdbeComment((v, "Init EXISTS result"));
114544	}
114545	if( pSel->pLimit ){
114546	/* The subquery already has a limit. If the pre-existing limit X is
114547	** not already integer value 1 or 0, then make the new limit X<>0 so that
114548	** the new limit is either 1 or 0 */
114549	Expr *pLeft = pSel->pLimit->pLeft;
114550	if( ExprHasProperty(pLeft, EP_IntValue)==0
114551	\|\| (pLeft->u.iValue!=1 && pLeft->u.iValue!=0)
114552	){
114553	sqlite3 *db = pParse->db;
114554	pLimit = sqlite3Expr(db, TK_INTEGER, "0");
114555	if( pLimit ){
114556	pLimit->affExpr = SQLITE_AFF_NUMERIC;
114557	pLimit = sqlite3PExpr(pParse, TK_NE,
114558	sqlite3ExprDup(db, pLeft, 0), pLimit);
114559	}
114560	sqlite3ExprDeferredDelete(pParse, pLeft);
114561	pSel->pLimit->pLeft = pLimit;
114562	}
114563	}else{
114564	/* If there is no pre-existing limit add a limit of 1 */
114565	pLimit = sqlite3Expr(pParse->db, TK_INTEGER, "1");
114566	pSel->pLimit = sqlite3PExpr(pParse, TK_LIMIT, pLimit, 0);
114567	}
	@@ -114473,11 +114812,11 @@
114812	if( destIfFalse==destIfNull ){
114813	/* Combine Step 3 and Step 5 into a single opcode */
114814	if( ExprHasProperty(pExpr, EP_Subrtn) ){
114815	const VdbeOp *pOp = sqlite3VdbeGetOp(v, pExpr->y.sub.iAddr);
114816	assert( pOp->opcode==OP_Once \|\| pParse->nErr );
114817	if( pOp->opcode==OP_Once && pOp->p3>0 ){ /* tag-202407032019 */
114818	assert( OptimizationEnabled(pParse->db, SQLITE_BloomFilter) );
114819	sqlite3VdbeAddOp4Int(v, OP_Filter, pOp->p3, destIfFalse,
114820	rLhs, nVector); VdbeCoverage(v);
114821	}
114822	}
	@@ -114660,11 +114999,16 @@
114999	iAddr = sqlite3VdbeAddOp3(v, OP_IfNullRow, pParse->iSelfTab-1, 0, regOut);
115000	}else{
115001	iAddr = 0;
115002	}
115003	sqlite3ExprCodeCopy(pParse, sqlite3ColumnExpr(pTab,pCol), regOut);
115004	if( (pCol->colFlags & COLFLAG_VIRTUAL)!=0
115005	&& (pTab->tabFlags & TF_Strict)!=0
115006	){
115007	int p3 = 2+(int)(pCol - pTab->aCol);
115008	sqlite3VdbeAddOp4(v, OP_TypeCheck, regOut, 1, p3, (char*)pTab, P4_TABLE);
115009	}else if( pCol->affinity>=SQLITE_AFF_TEXT ){
115010	sqlite3VdbeAddOp4(v, OP_Affinity, regOut, 1, 0, &pCol->affinity, 1);
115011	}
115012	if( iAddr ) sqlite3VdbeJumpHere(v, iAddr);
115013	if( pParse->nErr>nErr ) pParse->db->errByteOffset = -1;
115014	}
	@@ -115347,15 +115691,21 @@
115691	case TK_GT:
115692	case TK_GE:
115693	case TK_NE:
115694	case TK_EQ: {
115695	Expr *pLeft = pExpr->pLeft;
115696	int addrIsNull = 0;
115697	if( sqlite3ExprIsVector(pLeft) ){
115698	codeVectorCompare(pParse, pExpr, target, op, p5);
115699	}else{
115700	if( ExprHasProperty(pExpr, EP_Subquery) && p5!=SQLITE_NULLEQ ){
115701	addrIsNull = exprComputeOperands(pParse, pExpr,
115702	&r1, &r2, &regFree1, &regFree2);
115703	}else{
115704	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
115705	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
115706	}
115707	sqlite3VdbeAddOp2(v, OP_Integer, 1, inReg);
115708	codeCompare(pParse, pLeft, pExpr->pRight, op, r1, r2,
115709	sqlite3VdbeCurrentAddr(v)+2, p5,
115710	ExprHasProperty(pExpr,EP_Commuted));
115711	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
	@@ -115366,13 +115716,19 @@
115716	assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
115717	if( p5==SQLITE_NULLEQ ){
115718	sqlite3VdbeAddOp2(v, OP_Integer, 0, inReg);
115719	}else{
115720	sqlite3VdbeAddOp3(v, OP_ZeroOrNull, r1, inReg, r2);
115721	if( addrIsNull ){
115722	sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
115723	sqlite3VdbeJumpHere(v, addrIsNull);
115724	sqlite3VdbeAddOp2(v, OP_Null, 0, inReg);
115725	}
115726	}
115727	testcase( regFree1==0 );
115728	testcase( regFree2==0 );
115729
115730	}
115731	break;
115732	}
115733	case TK_AND:
115734	case TK_OR:
	@@ -115384,10 +115740,11 @@
115740	case TK_BITOR:
115741	case TK_SLASH:
115742	case TK_LSHIFT:
115743	case TK_RSHIFT:
115744	case TK_CONCAT: {
115745	int addrIsNull;
115746	assert( TK_AND==OP_And ); testcase( op==TK_AND );
115747	assert( TK_OR==OP_Or ); testcase( op==TK_OR );
115748	assert( TK_PLUS==OP_Add ); testcase( op==TK_PLUS );
115749	assert( TK_MINUS==OP_Subtract ); testcase( op==TK_MINUS );
115750	assert( TK_REM==OP_Remainder ); testcase( op==TK_REM );
	@@ -115395,15 +115752,27 @@
115752	assert( TK_BITOR==OP_BitOr ); testcase( op==TK_BITOR );
115753	assert( TK_SLASH==OP_Divide ); testcase( op==TK_SLASH );
115754	assert( TK_LSHIFT==OP_ShiftLeft ); testcase( op==TK_LSHIFT );
115755	assert( TK_RSHIFT==OP_ShiftRight ); testcase( op==TK_RSHIFT );
115756	assert( TK_CONCAT==OP_Concat ); testcase( op==TK_CONCAT );
115757	if( ExprHasProperty(pExpr, EP_Subquery) ){
115758	addrIsNull = exprComputeOperands(pParse, pExpr,
115759	&r1, &r2, &regFree1, &regFree2);
115760	}else{
115761	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
115762	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
115763	addrIsNull = 0;
115764	}
115765	sqlite3VdbeAddOp3(v, op, r2, r1, target);
115766	testcase( regFree1==0 );
115767	testcase( regFree2==0 );
115768	if( addrIsNull ){
115769	sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
115770	sqlite3VdbeJumpHere(v, addrIsNull);
115771	sqlite3VdbeAddOp2(v, OP_Null, 0, target);
115772	VdbeComment((v, "short-circut value"));
115773	}
115774	break;
115775	}
115776	case TK_UMINUS: {
115777	Expr *pLeft = pExpr->pLeft;
115778	assert( pLeft );
	@@ -116248,21 +116617,31 @@
116617	case TK_AND:
116618	case TK_OR: {
116619	Expr *pAlt = sqlite3ExprSimplifiedAndOr(pExpr);
116620	if( pAlt!=pExpr ){
116621	sqlite3ExprIfTrue(pParse, pAlt, dest, jumpIfNull);







116622	}else{
116623	Expr pFirst, pSecond;
116624	if( exprEvalRhsFirst(pExpr) ){
116625	pFirst = pExpr->pRight;
116626	pSecond = pExpr->pLeft;
116627	}else{
116628	pFirst = pExpr->pLeft;
116629	pSecond = pExpr->pRight;
116630	}
116631	if( op==TK_AND ){
116632	int d2 = sqlite3VdbeMakeLabel(pParse);
116633	testcase( jumpIfNull==0 );
116634	sqlite3ExprIfFalse(pParse, pFirst, d2,
116635	jumpIfNull^SQLITE_JUMPIFNULL);
116636	sqlite3ExprIfTrue(pParse, pSecond, dest, jumpIfNull);
116637	sqlite3VdbeResolveLabel(v, d2);
116638	}else{
116639	testcase( jumpIfNull==0 );
116640	sqlite3ExprIfTrue(pParse, pFirst, dest, jumpIfNull);
116641	sqlite3ExprIfTrue(pParse, pSecond, dest, jumpIfNull);
116642	}
116643	}
116644	break;
116645	}
116646	case TK_NOT: {
116647	testcase( jumpIfNull==0 );
	@@ -116297,14 +116676,20 @@
116676	case TK_LE:
116677	case TK_GT:
116678	case TK_GE:
116679	case TK_NE:
116680	case TK_EQ: {
116681	int addrIsNull;
116682	if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
116683	if( ExprHasProperty(pExpr, EP_Subquery) && jumpIfNull!=SQLITE_NULLEQ ){
116684	addrIsNull = exprComputeOperands(pParse, pExpr,
116685	&r1, &r2, &regFree1, &regFree2);
116686	}else{
116687	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116688	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
116689	addrIsNull = 0;
116690	}
116691	codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
116692	r1, r2, dest, jumpIfNull, ExprHasProperty(pExpr,EP_Commuted));
116693	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
116694	assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
116695	assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
	@@ -116315,22 +116700,29 @@
116700	assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
116701	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
116702	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
116703	testcase( regFree1==0 );
116704	testcase( regFree2==0 );
116705	if( addrIsNull ){
116706	if( jumpIfNull ){
116707	sqlite3VdbeChangeP2(v, addrIsNull, dest);
116708	}else{
116709	sqlite3VdbeJumpHere(v, addrIsNull);
116710	}
116711	}
116712	break;
116713	}
116714	case TK_ISNULL:
116715	case TK_NOTNULL: {
116716	assert( TK_ISNULL==OP_IsNull ); testcase( op==TK_ISNULL );
116717	assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
116718	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116719	assert( regFree1==0 \|\| regFree1==r1 );
116720	if( regFree1 ) sqlite3VdbeTypeofColumn(v, r1);
116721	sqlite3VdbeAddOp2(v, op, r1, dest);
116722	VdbeCoverageIf(v, op==TK_ISNULL);
116723	VdbeCoverageIf(v, op==TK_NOTNULL);

116724	break;
116725	}
116726	case TK_BETWEEN: {
116727	testcase( jumpIfNull==0 );
116728	exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfTrue, jumpIfNull);
	@@ -116422,21 +116814,31 @@
116814	case TK_AND:
116815	case TK_OR: {
116816	Expr *pAlt = sqlite3ExprSimplifiedAndOr(pExpr);
116817	if( pAlt!=pExpr ){
116818	sqlite3ExprIfFalse(pParse, pAlt, dest, jumpIfNull);




116819	}else{
116820	Expr pFirst, pSecond;
116821	if( exprEvalRhsFirst(pExpr) ){
116822	pFirst = pExpr->pRight;
116823	pSecond = pExpr->pLeft;
116824	}else{
116825	pFirst = pExpr->pLeft;
116826	pSecond = pExpr->pRight;
116827	}
116828	if( pExpr->op==TK_AND ){
116829	testcase( jumpIfNull==0 );
116830	sqlite3ExprIfFalse(pParse, pFirst, dest, jumpIfNull);
116831	sqlite3ExprIfFalse(pParse, pSecond, dest, jumpIfNull);
116832	}else{
116833	int d2 = sqlite3VdbeMakeLabel(pParse);
116834	testcase( jumpIfNull==0 );
116835	sqlite3ExprIfTrue(pParse, pFirst, d2,
116836	jumpIfNull^SQLITE_JUMPIFNULL);
116837	sqlite3ExprIfFalse(pParse, pSecond, dest, jumpIfNull);
116838	sqlite3VdbeResolveLabel(v, d2);
116839	}
116840	}
116841	break;
116842	}
116843	case TK_NOT: {
116844	testcase( jumpIfNull==0 );
	@@ -116474,14 +116876,20 @@
116876	case TK_LE:
116877	case TK_GT:
116878	case TK_GE:
116879	case TK_NE:
116880	case TK_EQ: {
116881	int addrIsNull;
116882	if( sqlite3ExprIsVector(pExpr->pLeft) ) goto default_expr;
116883	if( ExprHasProperty(pExpr, EP_Subquery) && jumpIfNull!=SQLITE_NULLEQ ){
116884	addrIsNull = exprComputeOperands(pParse, pExpr,
116885	&r1, &r2, &regFree1, &regFree2);
116886	}else{
116887	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116888	r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
116889	addrIsNull = 0;
116890	}
116891	codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
116892	r1, r2, dest, jumpIfNull,ExprHasProperty(pExpr,EP_Commuted));
116893	assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
116894	assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
116895	assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
	@@ -116492,20 +116900,27 @@
116900	assert(TK_NE==OP_Ne); testcase(op==OP_Ne);
116901	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull!=SQLITE_NULLEQ);
116902	VdbeCoverageIf(v, op==OP_Ne && jumpIfNull==SQLITE_NULLEQ);
116903	testcase( regFree1==0 );
116904	testcase( regFree2==0 );
116905	if( addrIsNull ){
116906	if( jumpIfNull ){
116907	sqlite3VdbeChangeP2(v, addrIsNull, dest);
116908	}else{
116909	sqlite3VdbeJumpHere(v, addrIsNull);
116910	}
116911	}
116912	break;
116913	}
116914	case TK_ISNULL:
116915	case TK_NOTNULL: {
116916	r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
116917	assert( regFree1==0 \|\| regFree1==r1 );
116918	if( regFree1 ) sqlite3VdbeTypeofColumn(v, r1);
116919	sqlite3VdbeAddOp2(v, op, r1, dest);
116920	testcase( op==TK_ISNULL ); VdbeCoverageIf(v, op==TK_ISNULL);
116921	testcase( op==TK_NOTNULL ); VdbeCoverageIf(v, op==TK_NOTNULL);

116922	break;
116923	}
116924	case TK_BETWEEN: {
116925	testcase( jumpIfNull==0 );
116926	exprCodeBetween(pParse, pExpr, dest, sqlite3ExprIfFalse, jumpIfNull);
	@@ -117401,11 +117816,13 @@
117816	AggInfo pAggInfo, / The AggInfo object to search and/or modify */
117817	Expr pExpr / Expr describing the column to find or insert */
117818	){
117819	struct AggInfo_col *pCol;
117820	int k;
117821	int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
117822
117823	assert( mxTerm <= SMXV(i16) );
117824	assert( pAggInfo->iFirstReg==0 );
117825	pCol = pAggInfo->aCol;
117826	for(k=0; k<pAggInfo->nColumn; k++, pCol++){
117827	if( pCol->pCExpr==pExpr ) return;
117828	if( pCol->iTable==pExpr->iTable
	@@ -117418,10 +117835,14 @@
117835	k = addAggInfoColumn(pParse->db, pAggInfo);
117836	if( k<0 ){
117837	/* OOM on resize */
117838	assert( pParse->db->mallocFailed );
117839	return;
117840	}
117841	if( k>mxTerm ){
117842	sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
117843	k = mxTerm;
117844	}
117845	pCol = &pAggInfo->aCol[k];
117846	assert( ExprUseYTab(pExpr) );
117847	pCol->pTab = pExpr->y.pTab;
117848	pCol->iTable = pExpr->iTable;
	@@ -117452,10 +117873,11 @@
117873	assert( pExpr->pAggInfo==0 \|\| pExpr->pAggInfo==pAggInfo );
117874	pExpr->pAggInfo = pAggInfo;
117875	if( pExpr->op==TK_COLUMN ){
117876	pExpr->op = TK_AGG_COLUMN;
117877	}
117878	assert( k <= SMXV(pExpr->iAgg) );
117879	pExpr->iAgg = (i16)k;
117880	}
117881
117882	/*
117883	** This is the xExprCallback for a tree walker. It is used to
	@@ -117536,17 +117958,23 @@
117958	){
117959	/* Check to see if pExpr is a duplicate of another aggregate
117960	** function that is already in the pAggInfo structure
117961	*/
117962	struct AggInfo_func *pItem = pAggInfo->aFunc;
117963	int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
117964	assert( mxTerm <= SMXV(i16) );
117965	for(i=0; i<pAggInfo->nFunc; i++, pItem++){
117966	if( NEVER(pItem->pFExpr==pExpr) ) break;
117967	if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
117968	break;
117969	}
117970	}
117971	if( i>mxTerm ){
117972	sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
117973	i = mxTerm;
117974	assert( i<pAggInfo->nFunc );
117975	}else if( i>=pAggInfo->nFunc ){
117976	/* pExpr is original. Make a new entry in pAggInfo->aFunc[]
117977	*/
117978	u8 enc = ENC(pParse->db);
117979	i = addAggInfoFunc(pParse->db, pAggInfo);
117980	if( i>=0 ){
	@@ -117596,10 +118024,11 @@
118024	}
118025	/* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
118026	*/
118027	assert( !ExprHasProperty(pExpr, EP_TokenOnly\|EP_Reduced) );
118028	ExprSetVVAProperty(pExpr, EP_NoReduce);
118029	assert( i <= SMXV(pExpr->iAgg) );
118030	pExpr->iAgg = (i16)i;
118031	pExpr->pAggInfo = pAggInfo;
118032	return WRC_Prune;
118033	}else{
118034	return WRC_Continue;
	@@ -118998,14 +119427,14 @@
119427	}else{
119428	nQuot = sqlite3Strlen30(zQuot)-1;
119429	}
119430
119431	assert( nQuot>=nNew && nSql>=0 && nNew>=0 );
119432	zOut = sqlite3DbMallocZero(db, (u64)nSql + pRename->nList*(u64)nQuot + 1);
119433	}else{
119434	assert( nSql>0 );
119435	zOut = (char)sqlite3DbMallocZero(db, (2(u64)nSql + 1) * 3);
119436	if( zOut ){
119437	zBuf1 = &zOut[nSql*2+1];
119438	zBuf2 = &zOut[nSql*4+2];
119439	}
119440	}
	@@ -121683,20 +122112,10 @@
122112	}
122113	#endif
122114	while( z[0]!=0 && z[0]!=' ' ) z++;
122115	while( z[0]==' ' ) z++;
122116	}










122117	}
122118	}
122119
122120	/*
122121	** This callback is invoked once for each index when reading the
	@@ -124091,11 +124510,11 @@
124510	*/
124511	SQLITE_PRIVATE int sqlite3TableColumnToIndex(Index *pIdx, int iCol){
124512	int i;
124513	i16 iCol16;
124514	assert( iCol>=(-1) && iCol<=SQLITE_MAX_COLUMN );
124515	assert( pIdx->nColumn<=SQLITE_MAX_COLUMN+1 );
124516	iCol16 = iCol;
124517	for(i=0; i<pIdx->nColumn; i++){
124518	if( iCol16==pIdx->aiColumn[i] ){
124519	return i;
124520	}
	@@ -127239,11 +127658,10 @@
127658	}else{
127659	j = pCExpr->iColumn;
127660	assert( j<=0x7fff );
127661	if( j<0 ){
127662	j = pTab->iPKey;

127663	}else{
127664	if( pTab->aCol[j].notNull==0 ){
127665	pIndex->uniqNotNull = 0;
127666	}
127667	if( pTab->aCol[j].colFlags & COLFLAG_VIRTUAL ){
	@@ -128158,20 +128576,26 @@
128576	** Append the contents of SrcList p2 to SrcList p1 and return the resulting
128577	** SrcList. Or, if an error occurs, return NULL. In all cases, p1 and p2
128578	** are deleted by this function.
128579	*/
128580	SQLITE_PRIVATE SrcList sqlite3SrcListAppendList(Parse pParse, SrcList p1, SrcList p2){
128581	assert( p1 );
128582	assert( p2 \|\| pParse->nErr );
128583	assert( p2==0 \|\| p2->nSrc>=1 );
128584	testcase( p1->nSrc==0 );
128585	if( p2 ){
128586	int nOld = p1->nSrc;
128587	SrcList *pNew = sqlite3SrcListEnlarge(pParse, p1, p2->nSrc, nOld);
128588	if( pNew==0 ){
128589	sqlite3SrcListDelete(pParse->db, p2);
128590	}else{
128591	p1 = pNew;
128592	memcpy(&p1->a[nOld], p2->a, p2->nSrc*sizeof(SrcItem));
128593	assert( nOld==1 \|\| (p2->a[0].fg.jointype & JT_LTORJ)==0 );
128594	assert( p1->nSrc>=1 );
128595	p1->a[0].fg.jointype \|= (JT_LTORJ & p2->a[0].fg.jointype);
128596	sqlite3DbFree(pParse->db, p2);

128597	}
128598	}
128599	return p1;
128600	}
128601
	@@ -132064,11 +132488,11 @@
132488	int argc,
132489	sqlite3_value **argv,
132490	int nSep,
132491	const char *zSep
132492	){
132493	i64 j, n = 0;
132494	int i;
132495	char *z;
132496	for(i=0; i<argc; i++){
132497	n += sqlite3_value_bytes(argv[i]);
132498	}
	@@ -132078,12 +132502,12 @@
132502	sqlite3_result_error_nomem(context);
132503	return;
132504	}
132505	j = 0;
132506	for(i=0; i<argc; i++){
132507	if( sqlite3_value_type(argv[i])!=SQLITE_NULL ){
132508	int k = sqlite3_value_bytes(argv[i]);
132509	const char v = (const char)sqlite3_value_text(argv[i]);
132510	if( v!=0 ){
132511	if( j>0 && nSep>0 ){
132512	memcpy(&z[j], zSep, nSep);
132513	j += nSep;
	@@ -135017,16 +135441,19 @@
135441	if( iReg==0 ){
135442	/* Move the previous opcode (which should be OP_MakeRecord) forward
135443	** by one slot and insert a new OP_TypeCheck where the current
135444	** OP_MakeRecord is found */
135445	VdbeOp *pPrev;
135446	int p3;
135447	sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
135448	pPrev = sqlite3VdbeGetLastOp(v);
135449	assert( pPrev!=0 );
135450	assert( pPrev->opcode==OP_MakeRecord \|\| sqlite3VdbeDb(v)->mallocFailed );
135451	pPrev->opcode = OP_TypeCheck;
135452	p3 = pPrev->p3;
135453	pPrev->p3 = 0;
135454	sqlite3VdbeAddOp3(v, OP_MakeRecord, pPrev->p1, pPrev->p2, p3);
135455	}else{
135456	/* Insert an isolated OP_Typecheck */
135457	sqlite3VdbeAddOp2(v, OP_TypeCheck, iReg, pTab->nNVCol);
135458	sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
135459	}
	@@ -138755,10 +139182,12 @@
139182	/* Version 3.43.0 and later */
139183	int (stmt_explain)(sqlite3_stmt,int);
139184	/* Version 3.44.0 and later */
139185	void (get_clientdata)(sqlite3,const char);
139186	int (set_clientdata)(sqlite3, const char, void, void()(void));
139187	/* Version 3.50.0 and later */
139188	int (setlk_timeout)(sqlite3,int,int);
139189	};
139190
139191	/*
139192	** This is the function signature used for all extension entry points. It
139193	** is also defined in the file "loadext.c".
	@@ -139088,10 +139517,12 @@
139517	/* Version 3.43.0 and later */
139518	#define sqlite3_stmt_explain sqlite3_api->stmt_explain
139519	/* Version 3.44.0 and later */
139520	#define sqlite3_get_clientdata sqlite3_api->get_clientdata
139521	#define sqlite3_set_clientdata sqlite3_api->set_clientdata
139522	/* Version 3.50.0 and later */
139523	#define sqlite3_setlk_timeout sqlite3_api->setlk_timeout
139524	#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
139525
139526	#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
139527	/* This case when the file really is being compiled as a loadable
139528	** extension */
	@@ -139609,11 +140040,13 @@
140040	sqlite3_is_interrupted,
140041	/* Version 3.43.0 and later */
140042	sqlite3_stmt_explain,
140043	/* Version 3.44.0 and later */
140044	sqlite3_get_clientdata,
140045	sqlite3_set_clientdata,
140046	/* Version 3.50.0 and later */
140047	sqlite3_setlk_timeout
140048	};
140049
140050	/* True if x is the directory separator character
140051	*/
140052	#if SQLITE_OS_WIN
	@@ -145235,11 +145668,11 @@
145668	SrcList pSrc, / Array of tables to search */
145669	int iStart, /* First member of pSrc->a[] to check */
145670	int iEnd, /* Last member of pSrc->a[] to check */
145671	const char zCol, / Name of the column we are looking for */
145672	int piTab, / Write index of pSrc->a[] here */
145673	int piCol, / Write index of pSrc->a[piTab].pSTab->aCol[] here /
145674	int bIgnoreHidden /* Ignore hidden columns */
145675	){
145676	int i; /* For looping over tables in pSrc */
145677	int iCol; /* Index of column matching zCol */
145678
	@@ -145447,11 +145880,11 @@
145880	"not present in both tables", zName);
145881	return 1;
145882	}
145883	pE1 = sqlite3CreateColumnExpr(db, pSrc, iLeft, iLeftCol);
145884	sqlite3SrcItemColumnUsed(&pSrc->a[iLeft], iLeftCol);
145885	if( (pSrc->a[0].fg.jointype & JT_LTORJ)!=0 && pParse->nErr==0 ){
145886	/* This branch runs if the query contains one or more RIGHT or FULL
145887	** JOINs. If only a single table on the left side of this join
145888	** contains the zName column, then this branch is a no-op.
145889	** But if there are two or more tables on the left side
145890	** of the join, construct a coalesce() function that gathers all
	@@ -145463,10 +145896,12 @@
145896	** JOIN. But older versions of SQLite do not do that, so we avoid
145897	** adding a new error so as to not break legacy applications.
145898	*/
145899	ExprList pFuncArgs = 0; / Arguments to the coalesce() */
145900	static const Token tkCoalesce = { "coalesce", 8 };
145901	assert( pE1!=0 );
145902	ExprSetProperty(pE1, EP_CanBeNull);
145903	while( tableAndColumnIndex(pSrc, iLeft+1, i, zName, &iLeft, &iLeftCol,
145904	pRight->fg.isSynthUsing)!=0 ){
145905	if( pSrc->a[iLeft].fg.isUsing==0
145906	\|\| sqlite3IdListIndex(pSrc->a[iLeft].u3.pUsing, zName)<0
145907	){
	@@ -145479,11 +145914,17 @@
145914	sqlite3SrcItemColumnUsed(&pSrc->a[iLeft], iLeftCol);
145915	}
145916	if( pFuncArgs ){
145917	pFuncArgs = sqlite3ExprListAppend(pParse, pFuncArgs, pE1);
145918	pE1 = sqlite3ExprFunction(pParse, pFuncArgs, &tkCoalesce, 0);
145919	if( pE1 ){
145920	pE1->affExpr = SQLITE_AFF_DEFER;
145921	}
145922	}
145923	}else if( (pSrc->a[i+1].fg.jointype & JT_LEFT)!=0 && pParse->nErr==0 ){
145924	assert( pE1!=0 );
145925	ExprSetProperty(pE1, EP_CanBeNull);
145926	}
145927	pE2 = sqlite3CreateColumnExpr(db, pSrc, i+1, iRightCol);
145928	sqlite3SrcItemColumnUsed(pRight, iRightCol);
145929	pEq = sqlite3PExpr(pParse, TK_EQ, pE1, pE2);
145930	assert( pE2!=0 \|\| pEq==0 );
	@@ -146956,10 +147397,14 @@
147397	#else
147398	zType = columnType(&sNC, p, 0, 0, 0);
147399	#endif
147400	sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
147401	}
147402	#else
147403	UNUSED_PARAMETER(pParse);
147404	UNUSED_PARAMETER(pTabList);
147405	UNUSED_PARAMETER(pEList);
147406	#endif /* !defined(SQLITE_OMIT_DECLTYPE) */
147407	}
147408
147409
147410	/*
	@@ -147875,11 +148320,13 @@
148320	int unionTab; /* Cursor number of the temp table holding result */
148321	u8 op = 0; /* One of the SRT_ operations to apply to self */
148322	int priorOp; /* The SRT_ operation to apply to prior selects */
148323	Expr pLimit; / Saved values of p->nLimit */
148324	int addr;
148325	int emptyBypass = 0; /* IfEmpty opcode to bypass RHS */
148326	SelectDest uniondest;
148327
148328
148329	testcase( p->op==TK_EXCEPT );
148330	testcase( p->op==TK_UNION );
148331	priorOp = SRT_Union;
148332	if( dest.eDest==priorOp ){
	@@ -147914,10 +148361,12 @@
148361
148362	/* Code the current SELECT statement
148363	*/
148364	if( p->op==TK_EXCEPT ){
148365	op = SRT_Except;
148366	emptyBypass = sqlite3VdbeAddOp1(v, OP_IfEmpty, unionTab);
148367	VdbeCoverage(v);
148368	}else{
148369	assert( p->op==TK_UNION );
148370	op = SRT_Union;
148371	}
148372	p->pPrior = 0;
	@@ -147934,10 +148383,11 @@
148383	p->pPrior = pPrior;
148384	p->pOrderBy = 0;
148385	if( p->op==TK_UNION ){
148386	p->nSelectRow = sqlite3LogEstAdd(p->nSelectRow, pPrior->nSelectRow);
148387	}
148388	if( emptyBypass ) sqlite3VdbeJumpHere(v, emptyBypass);
148389	sqlite3ExprDelete(db, p->pLimit);
148390	p->pLimit = pLimit;
148391	p->iLimit = 0;
148392	p->iOffset = 0;
148393
	@@ -147964,13 +148414,14 @@
148414	}
148415	default: assert( p->op==TK_INTERSECT ); {
148416	int tab1, tab2;
148417	int iCont, iBreak, iStart;
148418	Expr *pLimit;
148419	int addr, iLimit, iOffset;
148420	SelectDest intersectdest;
148421	int r1;
148422	int emptyBypass;
148423
148424	/* INTERSECT is different from the others since it requires
148425	** two temporary tables. Hence it has its own case. Begin
148426	** by allocating the tables we will need.
148427	*/
	@@ -147991,18 +148442,32 @@
148442	rc = sqlite3Select(pParse, pPrior, &intersectdest);
148443	if( rc ){
148444	goto multi_select_end;
148445	}
148446
148447	/* Initialize LIMIT counters before checking to see if the LHS
148448	** is empty, in case the jump is taken */
148449	iBreak = sqlite3VdbeMakeLabel(pParse);
148450	computeLimitRegisters(pParse, p, iBreak);
148451	emptyBypass = sqlite3VdbeAddOp1(v, OP_IfEmpty, tab1); VdbeCoverage(v);
148452
148453	/* Code the current SELECT into temporary table "tab2"
148454	*/
148455	addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, tab2, 0);
148456	assert( p->addrOpenEphm[1] == -1 );
148457	p->addrOpenEphm[1] = addr;
148458
148459	/* Disable prior SELECTs and the LIMIT counters during the computation
148460	** of the RHS select */
148461	pLimit = p->pLimit;
148462	iLimit = p->iLimit;
148463	iOffset = p->iOffset;
148464	p->pPrior = 0;
148465	p->pLimit = 0;
148466	p->iLimit = 0;
148467	p->iOffset = 0;
148468
148469	intersectdest.iSDParm = tab2;
148470	ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
148471	sqlite3SelectOpName(p->op)));
148472	TREETRACE(0x400, pParse, p, ("multiSelect INTERSECT right...\n"));
148473	rc = sqlite3Select(pParse, p, &intersectdest);
	@@ -148011,32 +148476,35 @@
148476	p->pPrior = pPrior;
148477	if( p->nSelectRow>pPrior->nSelectRow ){
148478	p->nSelectRow = pPrior->nSelectRow;
148479	}
148480	sqlite3ExprDelete(db, p->pLimit);
148481
148482	/* Reinstate the LIMIT counters prior to running the final intersect */
148483	p->pLimit = pLimit;
148484	p->iLimit = iLimit;
148485	p->iOffset = iOffset;
148486
148487	/* Generate code to take the intersection of the two temporary
148488	** tables.
148489	*/
148490	if( rc ) break;
148491	assert( p->pEList );
148492	sqlite3VdbeAddOp1(v, OP_Rewind, tab1);



148493	r1 = sqlite3GetTempReg(pParse);
148494	iStart = sqlite3VdbeAddOp2(v, OP_RowData, tab1, r1);
148495	iCont = sqlite3VdbeMakeLabel(pParse);
148496	sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0);
148497	VdbeCoverage(v);
148498	sqlite3ReleaseTempReg(pParse, r1);
148499	selectInnerLoop(pParse, p, tab1,
148500	0, 0, &dest, iCont, iBreak);
148501	sqlite3VdbeResolveLabel(v, iCont);
148502	sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart); VdbeCoverage(v);
148503	sqlite3VdbeResolveLabel(v, iBreak);
148504	sqlite3VdbeAddOp2(v, OP_Close, tab2, 0);
148505	sqlite3VdbeJumpHere(v, emptyBypass);
148506	sqlite3VdbeAddOp2(v, OP_Close, tab1, 0);
148507	break;
148508	}
148509	}
148510
	@@ -148711,10 +149179,11 @@
149179	typedef struct SubstContext {
149180	Parse pParse; / The parsing context */
149181	int iTable; /* Replace references to this table */
149182	int iNewTable; /* New table number */
149183	int isOuterJoin; /* Add TK_IF_NULL_ROW opcodes on each replacement */
149184	int nSelDepth; /* Depth of sub-query recursion. Top==1 */
149185	ExprList pEList; / Replacement expressions */
149186	ExprList pCList; / Collation sequences for replacement expr */
149187	} SubstContext;
149188
149189	/* Forward Declarations */
	@@ -148817,10 +149286,13 @@
149286	}
149287	}
149288	}else{
149289	if( pExpr->op==TK_IF_NULL_ROW && pExpr->iTable==pSubst->iTable ){
149290	pExpr->iTable = pSubst->iNewTable;
149291	}
149292	if( pExpr->op==TK_AGG_FUNCTION && pExpr->op2>=pSubst->nSelDepth ){
149293	pExpr->op2--;
149294	}
149295	pExpr->pLeft = substExpr(pSubst, pExpr->pLeft);
149296	pExpr->pRight = substExpr(pSubst, pExpr->pRight);
149297	if( ExprUseXSelect(pExpr) ){
149298	substSelect(pSubst, pExpr->x.pSelect, 1);
	@@ -148855,10 +149327,11 @@
149327	){
149328	SrcList *pSrc;
149329	SrcItem *pItem;
149330	int i;
149331	if( !p ) return;
149332	pSubst->nSelDepth++;
149333	do{
149334	substExprList(pSubst, p->pEList);
149335	substExprList(pSubst, p->pGroupBy);
149336	substExprList(pSubst, p->pOrderBy);
149337	p->pHaving = substExpr(pSubst, p->pHaving);
	@@ -148872,10 +149345,11 @@
149345	if( pItem->fg.isTabFunc ){
149346	substExprList(pSubst, pItem->u1.pFuncArg);
149347	}
149348	}
149349	}while( doPrior && (p = p->pPrior)!=0 );
149350	pSubst->nSelDepth--;
149351	}
149352	#endif /* !defined(SQLITE_OMIT_SUBQUERY) \|\| !defined(SQLITE_OMIT_VIEW) */
149353
149354	#if !defined(SQLITE_OMIT_SUBQUERY) \|\| !defined(SQLITE_OMIT_VIEW)
149355	/*
	@@ -149087,13 +149561,13 @@
149561	** other than the one FROM-clause subquery that is a candidate
149562	** for flattening. (This is due to ticket [2f7170d73bf9abf80]
149563	** from 2015-02-09.)
149564	**
149565	** (3) If the subquery is the right operand of a LEFT JOIN then
149566	** (3a) the subquery may not be a join
149567	() Was (3b): "the FROM clause of the subquery may not contain
149568	** a virtual table"
149569	() Was: "The outer query may not have a GROUP BY." This case
149570	** is now managed correctly
149571	** (3d) the outer query may not be DISTINCT.
149572	** See also (26) for restrictions on RIGHT JOIN.
149573	**
	@@ -149305,11 +149779,11 @@
149779	**
149780	** See also tickets #306, #350, and #3300.
149781	*/
149782	if( (pSubitem->fg.jointype & (JT_OUTER\|JT_LTORJ))!=0 ){
149783	if( pSubSrc->nSrc>1 /* (3a) */
149784	/**** \|\| IsVirtual(pSubSrc->a[0].pSTab) (3b)-omitted */
149785	\|\| (p->selFlags & SF_Distinct)!=0 /* (3d) */
149786	\|\| (pSubitem->fg.jointype & JT_RIGHT)!=0 /* (26) */
149787	){
149788	return 0;
149789	}
	@@ -149483,11 +149957,11 @@
149957	/* Defer deleting the Table object associated with the
149958	** subquery until code generation is
149959	** complete, since there may still exist Expr.pTab entries that
149960	** refer to the subquery even after flattening. Ticket #3346.
149961	**
149962	** pSubitem->pSTab is always non-NULL by test restrictions and tests above.
149963	*/
149964	if( ALWAYS(pSubitem->pSTab!=0) ){
149965	Table *pTabToDel = pSubitem->pSTab;
149966	if( pTabToDel->nTabRef==1 ){
149967	Parse *pToplevel = sqlite3ParseToplevel(pParse);
	@@ -149613,10 +150087,11 @@
150087	SubstContext x;
150088	x.pParse = pParse;
150089	x.iTable = iParent;
150090	x.iNewTable = iNewParent;
150091	x.isOuterJoin = isOuterJoin;
150092	x.nSelDepth = 0;
150093	x.pEList = pSub->pEList;
150094	x.pCList = findLeftmostExprlist(pSub);
150095	substSelect(&x, pParent, 0);
150096	}
150097
	@@ -150198,10 +150673,11 @@
150673	unsetJoinExpr(pNew, -1, 1);
150674	x.pParse = pParse;
150675	x.iTable = pSrc->iCursor;
150676	x.iNewTable = pSrc->iCursor;
150677	x.isOuterJoin = 0;
150678	x.nSelDepth = 0;
150679	x.pEList = pSubq->pEList;
150680	x.pCList = findLeftmostExprlist(pSubq);
150681	pNew = substExpr(&x, pNew);
150682	#ifndef SQLITE_OMIT_WINDOWFUNC
150683	if( pSubq->pWin && 0==pushDownWindowCheck(pParse, pSubq, pNew) ){
	@@ -150595,11 +151071,11 @@
151071	** a WITH clause on the stack currently maintained by the parser (on the
151072	** pParse->pWith linked list). And if currently processing a CTE
151073	** CTE expression, through routine checks to see if the reference is
151074	** a recursive reference to the CTE.
151075	**
151076	** If pFrom matches a CTE according to either of these two above, pFrom->pSTab
151077	** and other fields are populated accordingly.
151078	**
151079	** Return 0 if no match is found.
151080	** Return 1 if a match is found.
151081	** Return 2 if an error condition is detected.
	@@ -152221,10 +152697,87 @@
152697	pItem--;
152698	if( pItem->fg.isSubquery ) return 0; /* (1c-i) */
152699	}
152700	return 1;
152701	}
152702
152703	/*
152704	** Argument pWhere is the WHERE clause belonging to SELECT statement p. This
152705	** function attempts to transform expressions of the form:
152706	**
152707	** EXISTS (SELECT ...)
152708	**
152709	** into joins. For example, given
152710	**
152711	** CREATE TABLE sailors(sid INTEGER PRIMARY KEY, name TEXT);
152712	** CREATE TABLE reserves(sid INT, day DATE, PRIMARY KEY(sid, day));
152713	**
152714	** SELECT name FROM sailors AS S WHERE EXISTS (
152715	** SELECT * FROM reserves AS R WHERE S.sid = R.sid AND R.day = '2022-10-25'
152716	** );
152717	**
152718	** the SELECT statement may be transformed as follows:
152719	**
152720	** SELECT name FROM sailors AS S, reserves AS R
152721	** WHERE S.sid = R.sid AND R.day = '2022-10-25';
152722	**
152723	Approximately**. Really, we have to ensure that the FROM-clause term
152724	** that was formerly inside the EXISTS is only executed once. This is handled
152725	** by setting the SrcItem.fg.fromExists flag, which then causes code in
152726	** the where.c file to exit the corresponding loop after the first successful
152727	** match (if any).
152728	*/
152729	static SQLITE_NOINLINE void existsToJoin(
152730	Parse pParse, / Parsing context */
152731	Select p, / The SELECT statement being optimized */
152732	Expr pWhere / part of the WHERE clause currently being examined */
152733	){
152734	if( pParse->nErr==0
152735	&& pWhere!=0
152736	&& !ExprHasProperty(pWhere, EP_OuterON\|EP_InnerON)
152737	&& ALWAYS(p->pSrc!=0)
152738	&& p->pSrc->nSrc<BMS
152739	){
152740	if( pWhere->op==TK_AND ){
152741	Expr *pRight = pWhere->pRight;
152742	existsToJoin(pParse, p, pWhere->pLeft);
152743	existsToJoin(pParse, p, pRight);
152744	}
152745	else if( pWhere->op==TK_EXISTS ){
152746	Select *pSub = pWhere->x.pSelect;
152747	Expr *pSubWhere = pSub->pWhere;
152748	if( pSub->pSrc->nSrc==1
152749	&& (pSub->selFlags & SF_Aggregate)==0
152750	&& !pSub->pSrc->a[0].fg.isSubquery
152751	){
152752	memset(pWhere, 0, sizeof(*pWhere));
152753	pWhere->op = TK_INTEGER;
152754	pWhere->u.iValue = 1;
152755	ExprSetProperty(pWhere, EP_IntValue);
152756
152757	assert( p->pWhere!=0 );
152758	pSub->pSrc->a[0].fg.fromExists = 1;
152759	pSub->pSrc->a[0].fg.jointype \|= JT_CROSS;
152760	p->pSrc = sqlite3SrcListAppendList(pParse, p->pSrc, pSub->pSrc);
152761	if( pSubWhere ){
152762	p->pWhere = sqlite3PExpr(pParse, TK_AND, p->pWhere, pSubWhere);
152763	pSub->pWhere = 0;
152764	}
152765	pSub->pSrc = 0;
152766	sqlite3ParserAddCleanup(pParse, sqlite3SelectDeleteGeneric, pSub);
152767	#if TREETRACE_ENABLED
152768	if( sqlite3TreeTrace & 0x100000 ){
152769	TREETRACE(0x100000,pParse,p,
152770	("After EXISTS-to-JOIN optimization:\n"));
152771	sqlite3TreeViewSelect(0, p, 0);
152772	}
152773	#endif
152774	existsToJoin(pParse, p, pSubWhere);
152775	}
152776	}
152777	}
152778	}
152779
152780	/*
152781	** Generate byte-code for the SELECT statement given in the p argument.
152782	**
152783	** The results are returned according to the SelectDest structure.
	@@ -152589,10 +153142,17 @@
153142	#endif
153143	if( p->pNext==0 ) ExplainQueryPlanPop(pParse);
153144	return rc;
153145	}
153146	#endif
153147
153148	/* If there may be an "EXISTS (SELECT ...)" in the WHERE clause, attempt
153149	** to change it into a join. */
153150	if( pParse->bHasExists && OptimizationEnabled(db,SQLITE_ExistsToJoin) ){
153151	existsToJoin(pParse, p, p->pWhere);
153152	pTabList = p->pSrc;
153153	}
153154
153155	/* Do the WHERE-clause constant propagation optimization if this is
153156	** a join. No need to spend time on this operation for non-join queries
153157	** as the equivalent optimization will be handled by query planner in
153158	** sqlite3WhereBegin(). tag-select-0330
	@@ -153349,10 +153909,14 @@
153909	}
153910
153911	if( iOrderByCol ){
153912	Expr *pX = p->pEList->a[iOrderByCol-1].pExpr;
153913	Expr *pBase = sqlite3ExprSkipCollateAndLikely(pX);
153914	while( ALWAYS(pBase!=0) && pBase->op==TK_IF_NULL_ROW ){
153915	pX = pBase->pLeft;
153916	pBase = sqlite3ExprSkipCollateAndLikely(pX);
153917	}
153918	if( ALWAYS(pBase!=0)
153919	&& pBase->op!=TK_AGG_COLUMN
153920	&& pBase->op!=TK_REGISTER
153921	){
153922	sqlite3ExprToRegister(pX, iAMem+j);
	@@ -153372,24 +153936,24 @@
153936	** over to a0,a1,a2. It then calls the output subroutine
153937	** and resets the aggregate accumulator registers in preparation
153938	** for the next GROUP BY batch.
153939	*/
153940	sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
153941	VdbeComment((v, "output one row of %d", p->selId));
153942	sqlite3ExprCodeMove(pParse, iBMem, iAMem, pGroupBy->nExpr);
153943	sqlite3VdbeAddOp2(v, OP_IfPos, iAbortFlag, addrEnd); VdbeCoverage(v);
153944	VdbeComment((v, "check abort flag"));
153945	sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
153946	VdbeComment((v, "reset accumulator %d", p->selId));
153947
153948	/* Update the aggregate accumulators based on the content of
153949	** the current row
153950	*/
153951	sqlite3VdbeJumpHere(v, addr1);
153952	updateAccumulator(pParse, iUseFlag, pAggInfo, eDist);
153953	sqlite3VdbeAddOp2(v, OP_Integer, 1, iUseFlag);
153954	VdbeComment((v, "indicate data in accumulator %d", p->selId));
153955
153956	/* End of the loop
153957	*/
153958	if( groupBySort ){
153959	sqlite3VdbeAddOp2(v, OP_SorterNext, pAggInfo->sortingIdx,addrTopOfLoop);
	@@ -153402,11 +153966,11 @@
153966	sqlite3ExprListDelete(db, pDistinct);
153967
153968	/* Output the final row of result
153969	*/
153970	sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
153971	VdbeComment((v, "output final row of %d", p->selId));
153972
153973	/* Jump over the subroutines
153974	*/
153975	sqlite3VdbeGoto(v, addrEnd);
153976
	@@ -153423,26 +153987,26 @@
153987	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153988	sqlite3VdbeResolveLabel(v, addrOutputRow);
153989	addrOutputRow = sqlite3VdbeCurrentAddr(v);
153990	sqlite3VdbeAddOp2(v, OP_IfPos, iUseFlag, addrOutputRow+2);
153991	VdbeCoverage(v);
153992	VdbeComment((v, "Groupby result generator entry point %d", p->selId));
153993	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
153994	finalizeAggFunctions(pParse, pAggInfo);
153995	sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
153996	selectInnerLoop(pParse, p, -1, &sSort,
153997	&sDistinct, pDest,
153998	addrOutputRow+1, addrSetAbort);
153999	sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
154000	VdbeComment((v, "end groupby result generator %d", p->selId));
154001
154002	/* Generate a subroutine that will reset the group-by accumulator
154003	*/
154004	sqlite3VdbeResolveLabel(v, addrReset);
154005	resetAccumulator(pParse, pAggInfo);
154006	sqlite3VdbeAddOp2(v, OP_Integer, 0, iUseFlag);
154007	VdbeComment((v, "indicate accumulator %d empty", p->selId));
154008	sqlite3VdbeAddOp1(v, OP_Return, regReset);
154009
154010	if( distFlag!=0 && eDist!=WHERE_DISTINCT_NOOP ){
154011	struct AggInfo_func *pF = &pAggInfo->aFunc[0];
154012	fixDistinctOpenEph(pParse, eDist, pF->iDistinct, pF->iDistAddr);
	@@ -157326,11 +157890,12 @@
157890	saved_flags = db->flags;
157891	saved_mDbFlags = db->mDbFlags;
157892	saved_nChange = db->nChange;
157893	saved_nTotalChange = db->nTotalChange;
157894	saved_mTrace = db->mTrace;
157895	db->flags \|= SQLITE_WriteSchema \| SQLITE_IgnoreChecks \| SQLITE_Comments
157896	\| SQLITE_AttachCreate \| SQLITE_AttachWrite;
157897	db->mDbFlags \|= DBFLAG_PreferBuiltin \| DBFLAG_Vacuum;
157898	db->flags &= ~(u64)(SQLITE_ForeignKeys \| SQLITE_ReverseOrder
157899	\| SQLITE_Defensive \| SQLITE_CountRows);
157900	db->mTrace = 0;
157901
	@@ -159029,10 +159594,11 @@
159594	struct WhereLevel {
159595	int iLeftJoin; /* Memory cell used to implement LEFT OUTER JOIN */
159596	int iTabCur; /* The VDBE cursor used to access the table */
159597	int iIdxCur; /* The VDBE cursor used to access pIdx */
159598	int addrBrk; /* Jump here to break out of the loop */
159599	int addrHalt; /* Abort the query due to empty table or similar */
159600	int addrNxt; /* Jump here to start the next IN combination */
159601	int addrSkip; /* Jump here for next iteration of skip-scan */
159602	int addrCont; /* Jump here to continue with the next loop cycle */
159603	int addrFirst; /* First instruction of interior of the loop */
159604	int addrBody; /* Beginning of the body of this loop */
	@@ -159234,10 +159800,13 @@
159800	u16 eOperator; /* A WO_xx value describing <op> */
159801	u8 nChild; /* Number of children that must disable us */
159802	u8 eMatchOp; /* Op for vtab MATCH/LIKE/GLOB/REGEXP terms */
159803	int iParent; /* Disable pWC->a[iParent] when this term disabled */
159804	int leftCursor; /* Cursor number of X in "X <op> <expr>" */
159805	#ifdef SQLITE_DEBUG
159806	int iTerm; /* Which WhereTerm is this, for debug purposes */
159807	#endif
159808	union {
159809	struct {
159810	int leftColumn; /* Column number of X in "X <op> <expr>" */
159811	int iField; /* Field in (?,?,?) IN (SELECT...) vector */
159812	} x; /* Opcode other than OP_OR or OP_AND */
	@@ -159726,11 +160295,10 @@
160295	#if !defined(SQLITE_DEBUG)
160296	if( sqlite3ParseToplevel(pParse)->explain==2 \|\| IS_STMT_SCANSTATUS(pParse->db) )
160297	#endif
160298	{
160299	VdbeOp *pOp = sqlite3VdbeGetOp(pParse->pVdbe, addr);

160300	SrcItem *pItem = &pTabList->a[pLevel->iFrom];
160301	sqlite3 db = pParse->db; / Database handle */
160302	int isSearch; /* True for a SEARCH. False for SCAN. */
160303	WhereLoop pLoop; / The controlling WhereLoop object */
160304	u32 flags; /* Flags that describe this loop */
	@@ -159749,11 +160317,14 @@
160317	\|\| ((flags&WHERE_VIRTUALTABLE)==0 && (pLoop->u.btree.nEq>0))
160318	\|\| (wctrlFlags&(WHERE_ORDERBY_MIN\|WHERE_ORDERBY_MAX));
160319
160320	sqlite3StrAccumInit(&str, db, zBuf, sizeof(zBuf), SQLITE_MAX_LENGTH);
160321	str.printfFlags = SQLITE_PRINTF_INTERNAL;
160322	sqlite3_str_appendf(&str, "%s %S%s",
160323	isSearch ? "SEARCH" : "SCAN",
160324	pItem,
160325	pItem->fg.fromExists ? " EXISTS" : "");
160326	if( (flags & (WHERE_IPK\|WHERE_VIRTUALTABLE))==0 ){
160327	const char *zFmt = 0;
160328	Index *pIdx;
160329
160330	assert( pLoop->u.btree.pIndex!=0 );
	@@ -160198,11 +160769,13 @@
160769	for(i=iEq; i<pLoop->nLTerm; i++){
160770	if( pLoop->aLTerm[i]->pExpr==pX ){
160771	int iField;
160772	assert( (pLoop->aLTerm[i]->eOperator & (WO_OR\|WO_AND))==0 );
160773	iField = pLoop->aLTerm[i]->u.x.iField - 1;
160774	if( NEVER(pOrigRhs->a[iField].pExpr==0) ){
160775	continue; /* Duplicate PK column */
160776	}
160777	pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
160778	pOrigRhs->a[iField].pExpr = 0;
160779	if( pRhs ) pRhs->a[pRhs->nExpr-1].u.x.iOrderByCol = iField+1;
160780	if( pOrigLhs ){
160781	assert( pOrigLhs->a[iField].pExpr!=0 );
	@@ -160295,35 +160868,26 @@
160868	if( pLoop->aLTerm[i] && pLoop->aLTerm[i]->pExpr==pX ){
160869	disableTerm(pLevel, pTerm);
160870	return;
160871	}
160872	}
160873	for(i=iEq; i<pLoop->nLTerm; i++){
160874	assert( pLoop->aLTerm[i]!=0 );
160875	if( pLoop->aLTerm[i]->pExpr==pX ) nEq++;
160876	}
160877
160878	iTab = 0;
160879	if( !ExprUseXSelect(pX) \|\| pX->x.pSelect->pEList->nExpr==1 ){
160880	eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, 0, &iTab);
160881	}else{
160882	sqlite3 *db = pParse->db;
160883	Expr *pXMod = removeUnindexableInClauseTerms(pParse, iEq, pLoop, pX);
160884	if( !db->mallocFailed ){
160885	aiMap = (int)sqlite3DbMallocZero(db, sizeof(int)nEq);
160886	eType = sqlite3FindInIndex(pParse, pXMod, IN_INDEX_LOOP, 0, aiMap, &iTab);
160887	}
160888	sqlite3ExprDelete(db, pXMod);









160889	}
160890
160891	if( eType==IN_INDEX_INDEX_DESC ){
160892	testcase( bRev );
160893	bRev = !bRev;
	@@ -160349,11 +160913,11 @@
160913	sizeof(pLevel->u.in.aInLoop[0])*pLevel->u.in.nIn);
160914	pIn = pLevel->u.in.aInLoop;
160915	if( pIn ){
160916	int iMap = 0; /* Index in aiMap[] */
160917	pIn += i;
160918	for(i=iEq; i<pLoop->nLTerm; i++){
160919	if( pLoop->aLTerm[i]->pExpr==pX ){
160920	int iOut = iTarget + i - iEq;
160921	if( eType==IN_INDEX_ROWID ){
160922	pIn->addrInTop = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iOut);
160923	}else{
	@@ -161000,19 +161564,20 @@
161564	WhereInfo pWInfo, / Complete information about the WHERE clause */
161565	int iLevel, /* Which level of pWInfo->a[] should be coded */
161566	int addrNxt, /* Jump here to bypass inner loops */
161567	Bitmask notReady /* Loops that are not ready */
161568	){
161569	int saved_addrBrk;
161570	while( ++iLevel < pWInfo->nLevel ){
161571	WhereLevel *pLevel = &pWInfo->a[iLevel];
161572	WhereLoop *pLoop = pLevel->pWLoop;
161573	if( pLevel->regFilter==0 ) continue;
161574	if( pLevel->pWLoop->nSkip ) continue;
161575	/* ,--- Because sqlite3ConstructBloomFilter() has will not have set
161576	** vvvvv--' pLevel->regFilter if this were true. */
161577	if( NEVER(pLoop->prereq & notReady) ) continue;
161578	saved_addrBrk = pLevel->addrBrk;
161579	pLevel->addrBrk = addrNxt;
161580	if( pLoop->wsFlags & WHERE_IPK ){
161581	WhereTerm *pTerm = pLoop->aLTerm[0];
161582	int regRowid;
161583	assert( pTerm!=0 );
	@@ -161038,11 +161603,11 @@
161603	sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
161604	addrNxt, r1, nEq);
161605	VdbeCoverage(pParse->pVdbe);
161606	}
161607	pLevel->regFilter = 0;
161608	pLevel->addrBrk = saved_addrBrk;
161609	}
161610	}
161611
161612	/*
161613	** Loop pLoop is a WHERE_INDEXED level that uses at least one IN(...)
	@@ -161085,11 +161650,10 @@
161650	WhereClause pWC; / Decomposition of the entire WHERE clause */
161651	WhereTerm pTerm; / A WHERE clause term */
161652	sqlite3 db; / Database connection */
161653	SrcItem pTabItem; / FROM clause term being coded */
161654	int addrBrk; /* Jump here to break out of the loop */

161655	int addrCont; /* Jump here to continue with next cycle */
161656	int iRowidReg = 0; /* Rowid is stored in this register, if not zero */
161657	int iReleaseReg = 0; /* Temp register to free before returning */
161658	Index pIdx = 0; / Index used by loop (if any) */
161659	int iLoop; /* Iteration of constraint generator loop */
	@@ -161129,11 +161693,11 @@
161693	** When there is an IN operator, we also have a "addrNxt" label that
161694	** means to continue with the next IN value combination. When
161695	** there are no IN operators in the constraints, the "addrNxt" label
161696	** is the same as "addrBrk".
161697	*/
161698	addrBrk = pLevel->addrNxt = pLevel->addrBrk;
161699	addrCont = pLevel->addrCont = sqlite3VdbeMakeLabel(pParse);
161700
161701	/* If this is the right table of a LEFT OUTER JOIN, allocate and
161702	** initialize a memory cell that records if this table matches any
161703	** row of the left table of the join.
	@@ -161145,18 +161709,10 @@
161709	pLevel->iLeftJoin = ++pParse->nMem;
161710	sqlite3VdbeAddOp2(v, OP_Integer, 0, pLevel->iLeftJoin);
161711	VdbeComment((v, "init LEFT JOIN match flag"));
161712	}
161713








161714	/* Special case of a FROM clause subquery implemented as a co-routine */
161715	if( pTabItem->fg.viaCoroutine ){
161716	int regYield;
161717	Subquery *pSubq;
161718	assert( pTabItem->fg.isSubquery && pTabItem->u4.pSubq!=0 );
	@@ -161391,11 +161947,11 @@
161947	VdbeCoverageIf(v, pX->op==TK_LE);
161948	VdbeCoverageIf(v, pX->op==TK_LT);
161949	VdbeCoverageIf(v, pX->op==TK_GE);
161950	sqlite3ReleaseTempReg(pParse, rTemp);
161951	}else{
161952	sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, pLevel->addrHalt);
161953	VdbeCoverageIf(v, bRev==0);
161954	VdbeCoverageIf(v, bRev!=0);
161955	}
161956	if( pEnd ){
161957	Expr *pX;
	@@ -161431,40 +161987,40 @@
161987	VdbeCoverageIf(v, testOp==OP_Ge);
161988	VdbeCoverageIf(v, testOp==OP_Gt);
161989	sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC \| SQLITE_JUMPIFNULL);
161990	}
161991	}else if( pLoop->wsFlags & WHERE_INDEXED ){
161992	/* Case 4: Search using an index.
161993	**
161994	** The WHERE clause may contain zero or more equality
161995	** terms ("==" or "IN" or "IS" operators) that refer to the N
161996	** left-most columns of the index. It may also contain
161997	** inequality constraints (>, <, >= or <=) on the indexed
161998	** column that immediately follows the N equalities. Only
161999	** the right-most column can be an inequality - the rest must
162000	** use the "==", "IN", or "IS" operators. For example, if the
162001	** index is on (x,y,z), then the following clauses are all
162002	** optimized:
162003	**
162004	** x=5
162005	** x=5 AND y=10
162006	** x=5 AND y<10
162007	** x=5 AND y>5 AND y<10
162008	** x=5 AND y=5 AND z<=10
162009	**
162010	** The z<10 term of the following cannot be used, only
162011	** the x=5 term:
162012	**
162013	** x=5 AND z<10
162014	**
162015	** N may be zero if there are inequality constraints.
162016	** If there are no inequality constraints, then N is at
162017	** least one.
162018	**
162019	** This case is also used when there are no WHERE clause
162020	** constraints but an index is selected anyway, in order
162021	** to force the output order to conform to an ORDER BY.
162022	*/
162023	static const u8 aStartOp[] = {
162024	0,
162025	0,
162026	OP_Rewind, /* 2: (!start_constraints && startEq && !bRev) */
	@@ -161801,16 +162357,17 @@
162357	}
162358
162359	if( pLevel->iLeftJoin==0 ){
162360	/* If a partial index is driving the loop, try to eliminate WHERE clause
162361	** terms from the query that must be true due to the WHERE clause of
162362	** the partial index. This optimization does not work on an outer join,
162363	** as shown by:
162364	**
162365	** 2019-11-02 ticket 623eff57e76d45f6 (LEFT JOIN)
162366	** 2025-05-29 forum post 7dee41d32506c4ae (RIGHT JOIN)
162367	*/
162368	if( pIdx->pPartIdxWhere && pLevel->pRJ==0 ){
162369	whereApplyPartialIndexConstraints(pIdx->pPartIdxWhere, iCur, pWC);
162370	}
162371	}else{
162372	testcase( pIdx->pPartIdxWhere );
162373	/* The following assert() is not a requirement, merely an observation:
	@@ -162185,11 +162742,11 @@
162742	pLevel->op = OP_Noop;
162743	}else{
162744	codeCursorHint(pTabItem, pWInfo, pLevel, 0);
162745	pLevel->op = aStep[bRev];
162746	pLevel->p1 = iCur;
162747	pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, aStart[bRev],iCur,pLevel->addrHalt);
162748	VdbeCoverageIf(v, bRev==0);
162749	VdbeCoverageIf(v, bRev!=0);
162750	pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
162751	}
162752	}
	@@ -163479,34 +164036,46 @@
164036	** column references. This routine checks to see if pExpr is an equivalence
164037	** relation:
164038	** 1. The SQLITE_Transitive optimization must be enabled
164039	** 2. Must be either an == or an IS operator
164040	** 3. Not originating in the ON clause of an OUTER JOIN
164041	** 4. The operator is not IS or else the query does not contain RIGHT JOIN
164042	** 5. The affinities of A and B must be compatible
164043	** 6a. Both operands use the same collating sequence OR
164044	** 6b. The overall collating sequence is BINARY
164045	** If this routine returns TRUE, that means that the RHS can be substituted
164046	** for the LHS anyplace else in the WHERE clause where the LHS column occurs.
164047	** This is an optimization. No harm comes from returning 0. But if 1 is
164048	** returned when it should not be, then incorrect answers might result.
164049	*/
164050	static int termIsEquivalence(Parse pParse, Expr pExpr, SrcList *pSrc){
164051	char aff1, aff2;
164052	CollSeq *pColl;
164053	if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0; /* (1) */
164054	if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0; /* (2) */
164055	if( ExprHasProperty(pExpr, EP_OuterON) ) return 0; /* (3) */
164056	assert( pSrc!=0 );
164057	if( pExpr->op==TK_IS
164058	&& pSrc->nSrc>=2
164059	&& (pSrc->a[0].fg.jointype & JT_LTORJ)!=0
164060	){
164061	return 0; /* (4) */
164062	}
164063	aff1 = sqlite3ExprAffinity(pExpr->pLeft);
164064	aff2 = sqlite3ExprAffinity(pExpr->pRight);
164065	if( aff1!=aff2
164066	&& (!sqlite3IsNumericAffinity(aff1) \|\| !sqlite3IsNumericAffinity(aff2))
164067	){
164068	return 0; /* (5) */
164069	}
164070	pColl = sqlite3ExprCompareCollSeq(pParse, pExpr);
164071	if( !sqlite3IsBinary(pColl)
164072	&& !sqlite3ExprCollSeqMatch(pParse, pExpr->pLeft, pExpr->pRight)
164073	){
164074	return 0; /* (6) */
164075	}
164076	return 1;
164077	}
164078
164079	/*
164080	** Recursively walk the expressions of a SELECT statement and generate
164081	** a bitmask indicating which tables are used in that expression
	@@ -163660,10 +164229,13 @@
164229	if( db->mallocFailed ){
164230	return;
164231	}
164232	assert( pWC->nTerm > idxTerm );
164233	pTerm = &pWC->a[idxTerm];
164234	#ifdef SQLITE_DEBUG
164235	pTerm->iTerm = idxTerm;
164236	#endif
164237	pMaskSet = &pWInfo->sMaskSet;
164238	pExpr = pTerm->pExpr;
164239	assert( pExpr!=0 ); /* Because malloc() has not failed */
164240	assert( pExpr->op!=TK_AS && pExpr->op!=TK_COLLATE );
164241	pMaskSet->bVarSelect = 0;
	@@ -163767,12 +164339,12 @@
164339	pNew = &pWC->a[idxNew];
164340	markTermAsChild(pWC, idxNew, idxTerm);
164341	if( op==TK_IS ) pNew->wtFlags \|= TERM_IS;
164342	pTerm = &pWC->a[idxTerm];
164343	pTerm->wtFlags \|= TERM_COPIED;
164344	assert( pWInfo->pTabList!=0 );
164345	if( termIsEquivalence(pParse, pDup, pWInfo->pTabList) ){
164346	pTerm->eOperator \|= WO_EQUIV;
164347	eExtraOp = WO_EQUIV;
164348	}
164349	}else{
164350	pDup = pExpr;
	@@ -164074,11 +164646,11 @@
164646	pNewExpr->w.iJoin = pExpr->w.iJoin;
164647	}
164648	idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL\|TERM_DYNAMIC);
164649	testcase( idxNew==0 );
164650	pNewTerm = &pWC->a[idxNew];
164651	pNewTerm->prereqRight = prereqExpr \| extraRight;
164652	pNewTerm->leftCursor = pLeft->iTable;
164653	pNewTerm->u.x.leftColumn = pLeft->iColumn;
164654	pNewTerm->eOperator = WO_AUX;
164655	pNewTerm->eMatchOp = eOp2;
164656	markTermAsChild(pWC, idxNew, idxTerm);
	@@ -164185,11 +164757,11 @@
164757	** SELECT statement passed as the second argument. These terms are only
164758	** added if:
164759	**
164760	** 1. The SELECT statement has a LIMIT clause, and
164761	** 2. The SELECT statement is not an aggregate or DISTINCT query, and
164762	** 3. The SELECT statement has exactly one object in its FROM clause, and
164763	** that object is a virtual table, and
164764	** 4. There are no terms in the WHERE clause that will not be passed
164765	** to the virtual table xBestIndex method.
164766	** 5. The ORDER BY clause, if any, will be made available to the xBestIndex
164767	** method.
	@@ -164222,12 +164794,26 @@
164794	** pWC->a[] array. So this term can be ignored, as a LIMIT clause
164795	** will only be added if each of the child terms passes the
164796	** (leftCursor==iCsr) test below. */
164797	continue;
164798	}
164799	if( pWC->a[ii].leftCursor==iCsr && pWC->a[ii].prereqRight==0 ) continue;
164800
164801	/* If this term has a parent with exactly one child, and the parent will
164802	** be passed through to xBestIndex, then this term can be ignored. */
164803	if( pWC->a[ii].iParent>=0 ){
164804	WhereTerm *pParent = &pWC->a[ pWC->a[ii].iParent ];
164805	if( pParent->leftCursor==iCsr
164806	&& pParent->prereqRight==0
164807	&& pParent->nChild==1
164808	){
164809	continue;
164810	}
164811	}
164812
164813	/* This term will not be passed through. Do not add a LIMIT clause. */
164814	return;
164815	}
164816
164817	/* Check condition (5). Return early if it is not met. */
164818	if( pOrderBy ){
164819	for(ii=0; ii<pOrderBy->nExpr; ii++){
	@@ -164887,15 +165473,15 @@
165473	continue;
165474	}
165475	pScan->pWC = pWC;
165476	pScan->k = k+1;
165477	#ifdef WHERETRACE_ENABLED
165478	if( (sqlite3WhereTrace & 0x20000)!=0 && pScan->nEquiv>1 ){
165479	int ii;
165480	sqlite3DebugPrintf("EQUIVALENT TO {%d:%d} (due to TERM-%d):",
165481	pScan->aiCur[0], pScan->aiColumn[0], pTerm->iTerm);
165482	for(ii=1; ii<pScan->nEquiv; ii++){
165483	sqlite3DebugPrintf(" {%d:%d}",
165484	pScan->aiCur[ii], pScan->aiColumn[ii]);
165485	}
165486	sqlite3DebugPrintf("\n");
165487	}
	@@ -165662,11 +166248,13 @@
166248	sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, pSubq->addrFillSub);
166249	addrTop = sqlite3VdbeAddOp1(v, OP_Yield, regYield);
166250	VdbeCoverage(v);
166251	VdbeComment((v, "next row of %s", pSrc->pSTab->zName));
166252	}else{
166253	assert( pLevel->addrHalt );
166254	addrTop = sqlite3VdbeAddOp2(v, OP_Rewind,pLevel->iTabCur,pLevel->addrHalt);
166255	VdbeCoverage(v);
166256	}
166257	if( pPartial ){
166258	iContinue = sqlite3VdbeMakeLabel(pParse);
166259	sqlite3ExprIfFalse(pParse, pPartial, iContinue, SQLITE_JUMPIFNULL);
166260	pLoop->wsFlags \|= WHERE_PARTIALIDX;
	@@ -165690,15 +166278,18 @@
166278	assert( pLevel->iIdxCur>0 );
166279	translateColumnToCopy(pParse, addrTop, pLevel->iTabCur,
166280	pSrc->u4.pSubq->regResult, pLevel->iIdxCur);
166281	sqlite3VdbeGoto(v, addrTop);
166282	pSrc->fg.viaCoroutine = 0;
166283	sqlite3VdbeJumpHere(v, addrTop);
166284	}else{
166285	sqlite3VdbeAddOp2(v, OP_Next, pLevel->iTabCur, addrTop+1); VdbeCoverage(v);
166286	sqlite3VdbeChangeP5(v, SQLITE_STMTSTATUS_AUTOINDEX);
166287	if( (pSrc->fg.jointype & JT_LEFT)!=0 ){
166288	sqlite3VdbeJumpHere(v, addrTop);
166289	}
166290	}

166291	sqlite3ReleaseTempReg(pParse, regRecord);
166292
166293	/* Jump here when skipping the initialization */
166294	sqlite3VdbeJumpHere(v, addrInit);
166295	sqlite3VdbeScanStatusRange(v, addrExp, addrExp, -1);
	@@ -166846,10 +167437,11 @@
167437	sqlite3_snprintf(sizeof(zLeft),zLeft,"indexable=0x%llx",
167438	pTerm->u.pOrInfo->indexable);
167439	}else{
167440	sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor);
167441	}
167442	iTerm = pTerm->iTerm = MAX(iTerm,pTerm->iTerm);
167443	sqlite3DebugPrintf(
167444	"TERM-%-3d %p %s %-12s op=%03x wtFlags=%04x",
167445	iTerm, pTerm, zType, zLeft, pTerm->eOperator, pTerm->wtFlags);
167446	/* The 0x10000 .wheretrace flag causes extra information to be
167447	** shown about each Term */
	@@ -167620,15 +168212,12 @@
168212	opMask = WO_LT\|WO_LE;
168213	}else{
168214	assert( pNew->u.btree.nBtm==0 );
168215	opMask = WO_EQ\|WO_IN\|WO_GT\|WO_GE\|WO_LT\|WO_LE\|WO_ISNULL\|WO_IS;
168216	}
168217	if( pProbe->bUnordered ){
168218	opMask &= ~(WO_GT\|WO_GE\|WO_LT\|WO_LE);



168219	}
168220
168221	assert( pNew->u.btree.nEq<pProbe->nColumn );
168222	assert( pNew->u.btree.nEq<pProbe->nKeyCol
168223	\|\| pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY );
	@@ -167697,19 +168286,33 @@
168286	if( eOp & WO_IN ){
168287	Expr *pExpr = pTerm->pExpr;
168288	if( ExprUseXSelect(pExpr) ){
168289	/* "x IN (SELECT ...)": TUNING: the SELECT returns 25 rows */
168290	int i;
168291	int bRedundant = 0;
168292	nIn = 46; assert( 46==sqlite3LogEst(25) );
168293
168294	/* The expression may actually be of the form (x, y) IN (SELECT...).
168295	** In this case there is a separate term for each of (x) and (y).
168296	** However, the nIn multiplier should only be applied once, not once
168297	** for each such term. The following loop checks that pTerm is the
168298	** first such term in use, and sets nIn back to 0 if it is not. */
168299	for(i=0; i<pNew->nLTerm-1; i++){
168300	if( pNew->aLTerm[i] && pNew->aLTerm[i]->pExpr==pExpr ){
168301	nIn = 0;
168302	if( pNew->aLTerm[i]->u.x.iField == pTerm->u.x.iField ){
168303	/* Detect when two or more columns of an index match the same
168304	** column of a vector IN operater, and avoid adding the column
168305	** to the WhereLoop more than once. See tag-20250707-01
168306	** in test/rowvalue.test */
168307	bRedundant = 1;
168308	}
168309	}
168310	}
168311	if( bRedundant ){
168312	pNew->nLTerm--;
168313	continue;
168314	}
168315	}else if( ALWAYS(pExpr->x.pList && pExpr->x.pList->nExpr) ){
168316	/* "x IN (value, value, ...)" */
168317	nIn = sqlite3LogEst(pExpr->x.pList->nExpr);
168318	}
	@@ -167937,11 +168540,11 @@
168540	}
168541
168542	if( (pNew->wsFlags & WHERE_TOP_LIMIT)==0
168543	&& pNew->u.btree.nEq<pProbe->nColumn
168544	&& (pNew->u.btree.nEq<pProbe->nKeyCol \|\|
168545	pProbe->idxType!=SQLITE_IDXTYPE_PRIMARYKEY)
168546	){
168547	if( pNew->u.btree.nEq>3 ){
168548	sqlite3ProgressCheck(pParse);
168549	}
168550	whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nInMul+nIn);
	@@ -167976,10 +168579,11 @@
168579	&& saved_nEq==pNew->nLTerm
168580	&& pProbe->noSkipScan==0
168581	&& pProbe->hasStat1!=0
168582	&& OptimizationEnabled(db, SQLITE_SkipScan)
168583	&& pProbe->aiRowLogEst[saved_nEq+1]>=42 /* TUNING: Minimum for skip-scan */
168584	&& pSrc->fg.fromExists==0
168585	&& (rc = whereLoopResize(db, pNew, pNew->nLTerm+1))==SQLITE_OK
168586	){
168587	LogEst nIter;
168588	pNew->u.btree.nEq++;
168589	pNew->nSkip++;
	@@ -168066,10 +168670,11 @@
168670	Expr *pExpr;
168671	pExpr = pTerm->pExpr;
168672	if( (!ExprHasProperty(pExpr, EP_OuterON) \|\| pExpr->w.iJoin==iTab)
168673	&& ((jointype & JT_OUTER)==0 \|\| ExprHasProperty(pExpr, EP_OuterON))
168674	&& sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, iTab)
168675	&& !sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, -1)
168676	&& (pTerm->wtFlags & TERM_VNULL)==0
168677	){
168678	return 1;
168679	}
168680	}
	@@ -168561,11 +169166,11 @@
169166	}
169167	}else if( m==0
169168	&& (HasRowid(pTab) \|\| pWInfo->pSelect!=0 \|\| sqlite3FaultSim(700))
169169	){
169170	WHERETRACE(0x200,
169171	("-> %s is a covering index according to bitmasks\n",
169172	pProbe->zName, m==0 ? "is" : "is not"));
169173	pNew->wsFlags = WHERE_IDX_ONLY \| WHERE_INDEXED;
169174	}
169175	}
169176
	@@ -171532,10 +172137,18 @@
172137
172138	pTabItem = &pTabList->a[pLevel->iFrom];
172139	pTab = pTabItem->pSTab;
172140	iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
172141	pLoop = pLevel->pWLoop;
172142	pLevel->addrBrk = sqlite3VdbeMakeLabel(pParse);
172143	if( ii==0 \|\| (pTabItem[0].fg.jointype & JT_LEFT)!=0 ){
172144	pLevel->addrHalt = pLevel->addrBrk;
172145	}else if( pWInfo->a[ii-1].pRJ ){
172146	pLevel->addrHalt = pWInfo->a[ii-1].addrBrk;
172147	}else{
172148	pLevel->addrHalt = pWInfo->a[ii-1].addrHalt;
172149	}
172150	if( (pTab->tabFlags & TF_Ephemeral)!=0 \|\| IsView(pTab) ){
172151	/* Do nothing */
172152	}else
172153	#ifndef SQLITE_OMIT_VIRTUALTABLE
172154	if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 ){
	@@ -171583,10 +172196,17 @@
172196	}
172197	#ifdef SQLITE_ENABLE_COLUMN_USED_MASK
172198	sqlite3VdbeAddOp4Dup8(v, OP_ColumnsUsed, pTabItem->iCursor, 0, 0,
172199	(const u8*)&pTabItem->colUsed, P4_INT64);
172200	#endif
172201	if( ii>=2
172202	&& (pTabItem[0].fg.jointype & (JT_LTORJ\|JT_LEFT))==0
172203	&& pLevel->addrHalt==pWInfo->a[0].addrHalt
172204	){
172205	sqlite3VdbeAddOp2(v, OP_IfEmpty, pTabItem->iCursor, pWInfo->iBreak);
172206	VdbeCoverage(v);
172207	}
172208	}else{
172209	sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
172210	}
172211	if( pLoop->wsFlags & WHERE_INDEXED ){
172212	Index *pIx = pLoop->u.btree.pIndex;
	@@ -171839,10 +172459,13 @@
172459	VdbeCoverageIf(v, op==OP_SeekLT);
172460	VdbeCoverageIf(v, op==OP_SeekGT);
172461	sqlite3VdbeAddOp2(v, OP_Goto, 1, pLevel->p2);
172462	}
172463	#endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */
172464	if( pTabList->a[pLevel->iFrom].fg.fromExists ){
172465	sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
172466	}
172467	/* The common case: Advance to the next row */
172468	if( pLevel->addrCont ) sqlite3VdbeResolveLabel(v, pLevel->addrCont);
172469	sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
172470	sqlite3VdbeChangeP5(v, pLevel->p5);
172471	VdbeCoverage(v);
	@@ -179911,16 +180534,25 @@
180534	/* Expressions of the form
180535	**
180536	** expr1 IN ()
180537	** expr1 NOT IN ()
180538	**
180539	** simplify to constants 0 (false) and 1 (true), respectively.
180540	**
180541	** Except, do not apply this optimization if expr1 contains a function
180542	** because that function might be an aggregate (we don't know yet whether
180543	** it is or not) and if it is an aggregate, that could change the meaning
180544	** of the whole query.
180545	*/
180546	Expr *pB = sqlite3Expr(pParse->db, TK_STRING, yymsp[-3].minor.yy502 ? "true" : "false");
180547	if( pB ) sqlite3ExprIdToTrueFalse(pB);
180548	if( !ExprHasProperty(yymsp[-4].minor.yy590, EP_HasFunc) ){
180549	sqlite3ExprUnmapAndDelete(pParse, yymsp[-4].minor.yy590);
180550	yymsp[-4].minor.yy590 = pB;
180551	}else{
180552	yymsp[-4].minor.yy590 = sqlite3PExpr(pParse, yymsp[-3].minor.yy502 ? TK_OR : TK_AND, pB, yymsp[-4].minor.yy590);
180553	}
180554	}else{
180555	Expr *pRHS = yymsp[-1].minor.yy402->a[0].pExpr;
180556	if( yymsp[-1].minor.yy402->nExpr==1 && sqlite3ExprIsConstant(pParse,pRHS) && yymsp[-4].minor.yy590->op!=TK_VECTOR ){
180557	yymsp[-1].minor.yy402->a[0].pExpr = 0;
180558	sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy402);
	@@ -181522,11 +182154,11 @@
182154	static int getToken(const unsigned char **pz){
182155	const unsigned char z = pz;
182156	int t; /* Token type to return */
182157	do {
182158	z += sqlite3GetToken(z, &t);
182159	}while( t==TK_SPACE \|\| t==TK_COMMENT );
182160	if( t==TK_ID
182161	\|\| t==TK_STRING
182162	\|\| t==TK_JOIN_KW
182163	\|\| t==TK_WINDOW
182164	\|\| t==TK_OVER
	@@ -184472,10 +185104,11 @@
185104	#ifdef SQLITE_ENABLE_API_ARMOR
185105	if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
185106	#endif
185107	if( ms<-1 ) return SQLITE_RANGE;
185108	#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
185109	sqlite3_mutex_enter(db->mutex);
185110	db->setlkTimeout = ms;
185111	db->setlkFlags = flags;
185112	sqlite3BtreeEnterAll(db);
185113	for(iDb=0; iDb<db->nDb; iDb++){
185114	Btree *pBt = db->aDb[iDb].pBt;
	@@ -184483,10 +185116,11 @@
185116	sqlite3_file *fd = sqlite3PagerFile(sqlite3BtreePager(pBt));
185117	sqlite3OsFileControlHint(fd, SQLITE_FCNTL_BLOCK_ON_CONNECT, (void*)&bBOC);
185118	}
185119	}
185120	sqlite3BtreeLeaveAll(db);
185121	sqlite3_mutex_leave(db->mutex);
185122	#endif
185123	#if !defined(SQLITE_ENABLE_API_ARMOR) && !defined(SQLITE_ENABLE_SETLK_TIMEOUT)
185124	UNUSED_PARAMETER(db);
185125	UNUSED_PARAMETER(flags);
185126	#endif
	@@ -188869,11 +189503,11 @@
189503
189504	/*
189505	** Macros needed to provide flexible arrays in a portable way
189506	*/
189507	#ifndef offsetof
189508	# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
189509	#endif
189510	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
189511	# define FLEXARRAY
189512	#else
189513	# define FLEXARRAY 1
	@@ -207968,60 +208602,113 @@
208602	** Growing our own isspace() routine this way is twice as fast as
208603	** the library isspace() function, resulting in a 7% overall performance
208604	** increase for the text-JSON parser. (Ubuntu14.10 gcc 4.8.4 x64 with -Os).
208605	*/
208606	static const char jsonIsSpace[] = {
208607	#ifdef SQLITE_ASCII
208608	/0 1 2 3 4 5 6 7 8 9 a b c d e f /
208609	0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0 */
208610	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
208611	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2 */
208612	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 3 */
208613	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 4 */
208614	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 5 */
208615	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 6 */
208616	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 7 */
208617
208618	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 8 */
208619	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9 */
208620	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* a */
208621	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* b */
208622	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* c */
208623	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* d */
208624	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* e */
208625	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* f */
208626	#endif
208627	#ifdef SQLITE_EBCDIC
208628	/0 1 2 3 4 5 6 7 8 9 a b c d e f /
208629	0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, /* 0 */
208630	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
208631	0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2 */
208632	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 3 */
208633	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 4 */
208634	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 5 */
208635	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 6 */
208636	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 7 */
208637
208638	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 8 */
208639	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9 */
208640	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* a */
208641	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* b */
208642	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* c */
208643	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* d */
208644	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* e */
208645	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* f */
208646	#endif
208647
208648	};
208649	#define jsonIsspace(x) (jsonIsSpace[(unsigned char)x])
208650
208651	/*
208652	** The set of all space characters recognized by jsonIsspace().
208653	** Useful as the second argument to strspn().
208654	*/
208655	#ifdef SQLITE_ASCII
208656	static const char jsonSpaces[] = "\011\012\015\040";
208657	#endif
208658	#ifdef SQLITE_EBCDIC
208659	static const char jsonSpaces[] = "\005\045\015\100";
208660	#endif
208661
208662
208663	/*
208664	** Characters that are special to JSON. Control characters,
208665	** '"' and '\\' and '\''. Actually, '\'' is not special to
208666	** canonical JSON, but it is special in JSON-5, so we include
208667	** it in the set of special characters.
208668	*/
208669	static const char jsonIsOk[256] = {
208670	#ifdef SQLITE_ASCII
208671	/0 1 2 3 4 5 6 7 8 9 a b c d e f /
208672	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0 */
208673	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
208674	1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, /* 2 */
208675	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 3 */
208676	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4 */
208677	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, /* 5 */
208678	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6 */
208679	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 7 */
208680
208681	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 8 */
208682	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 9 */
208683	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* a */
208684	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* b */
208685	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* c */
208686	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* d */
208687	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* e */
208688	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* f */
208689	#endif
208690	#ifdef SQLITE_EBCDIC
208691	/0 1 2 3 4 5 6 7 8 9 a b c d e f /
208692	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0 */
208693	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1 */
208694	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2 */
208695	1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, /* 3 */
208696	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4 */
208697	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 5 */
208698	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 6 */
208699	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, /* 7 */
208700
208701	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 8 */
208702	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 9 */
208703	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* a */
208704	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* b */
208705	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* c */
208706	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* d */
208707	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* e */
208708	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* f */
208709	#endif
208710	};
208711
208712	/* Objects */
208713	typedef struct JsonCache JsonCache;
208714	typedef struct JsonString JsonString;
	@@ -208162,11 +208849,11 @@
208849
208850	/**************************************************************************
208851	** Forward references
208852	**************************************************************************/
208853	static void jsonReturnStringAsBlob(JsonString*);
208854	static int jsonArgIsJsonb(sqlite3_value pJson, JsonParse p);
208855	static u32 jsonTranslateBlobToText(const JsonParse,u32,JsonString);
208856	static void jsonReturnParse(sqlite3_context,JsonParse);
208857	static JsonParse jsonParseFuncArg(sqlite3_context,sqlite3_value*,u32);
208858	static void jsonParseFree(JsonParse*);
208859	static u32 jsonbPayloadSize(const JsonParse, u32, u32);
	@@ -208580,15 +209267,13 @@
209267	jsonAppendString(p, z, n);
209268	}
209269	break;
209270	}
209271	default: {
209272	JsonParse px;
209273	memset(&px, 0, sizeof(px));
209274	if( jsonArgIsJsonb(pValue, &px) ){


209275	jsonTranslateBlobToText(&px, 0, p);
209276	}else if( p->eErr==0 ){
209277	sqlite3_result_error(p->pCtx, "JSON cannot hold BLOB values", -1);
209278	p->eErr = JSTRING_ERR;
209279	jsonStringReset(p);
	@@ -209051,12 +209736,14 @@
209736	nExtra = 0;
209737	}else if( szType==12 ){
209738	nExtra = 1;
209739	}else if( szType==13 ){
209740	nExtra = 2;
209741	}else if( szType==14 ){
209742	nExtra = 4;
209743	}else{
209744	nExtra = 8;
209745	}
209746	if( szPayload<=11 ){
209747	nNeeded = 0;
209748	}else if( szPayload<=0xff ){
209749	nNeeded = 1;
	@@ -209522,11 +210209,16 @@
210209	c = z[++j];
210210	if( c=='"' \|\| c=='\\' \|\| c=='/' \|\| c=='b' \|\| c=='f'
210211	\|\| c=='n' \|\| c=='r' \|\| c=='t'
210212	\|\| (c=='u' && jsonIs4Hex(&z[j+1])) ){
210213	if( opcode==JSONB_TEXT ) opcode = JSONB_TEXTJ;
210214	}else if( c=='\'' \|\| c=='v' \|\| c=='\n'
210215	#ifdef SQLITE_BUG_COMPATIBLE_20250510
210216	\|\| (c=='0') /* Legacy bug compatible */
210217	#else
210218	\|\| (c=='0' && !sqlite3Isdigit(z[j+1])) /* Correct implementation */
210219	#endif
210220	\|\| (0xe2==(u8)c && 0x80==(u8)z[j+1]
210221	&& (0xa8==(u8)z[j+2] \|\| 0xa9==(u8)z[j+2]))
210222	\|\| (c=='x' && jsonIs2Hex(&z[j+1])) ){
210223	opcode = JSONB_TEXT5;
210224	pParse->hasNonstd = 1;
	@@ -209909,11 +210601,11 @@
210601	\|\| pParse->aBlob[i+4]!=0
210602	){
210603	*pSz = 0;
210604	return 0;
210605	}
210606	sz = ((u32)pParse->aBlob[i+5]<<24) + (pParse->aBlob[i+6]<<16) +
210607	(pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8];
210608	n = 9;
210609	}
210610	if( (i64)i+sz+n > pParse->nBlob
210611	&& (i64)i+sz+n > pParse->nBlob-pParse->delta
	@@ -210258,37 +210950,10 @@
210950	}
210951	}
210952	return i;
210953	}
210954



























210955	/*
210956	** Given that a JSONB_ARRAY object starts at offset i, return
210957	** the number of entries in that array.
210958	*/
210959	static u32 jsonbArrayCount(JsonParse *pParse, u32 iRoot){
	@@ -210517,11 +211182,25 @@
211182	case 'f': { *piOut = '\f'; return 2; }
211183	case 'n': { *piOut = '\n'; return 2; }
211184	case 'r': { *piOut = '\r'; return 2; }
211185	case 't': { *piOut = '\t'; return 2; }
211186	case 'v': { *piOut = '\v'; return 2; }
211187	case '0': {
211188	/* JSON5 requires that the \0 escape not be followed by a digit.
211189	** But SQLite did not enforce this restriction in versions 3.42.0
211190	** through 3.49.2. That was a bug. But some applications might have
211191	** come to depend on that bug. Use the SQLITE_BUG_COMPATIBLE_20250510
211192	** option to restore the old buggy behavior. */
211193	#ifdef SQLITE_BUG_COMPATIBLE_20250510
211194	/* Legacy bug-compatible behavior */
211195	*piOut = 0;
211196	#else
211197	/* Correct behavior */
211198	*piOut = (n>2 && sqlite3Isdigit(z[2])) ? JSON_INVALID_CHAR : 0;
211199	#endif
211200	return 2;
211201	}
211202	case '\'':
211203	case '"':
211204	case '/':
211205	case '\\':{ *piOut = z[1]; return 2; }
211206	case 'x': {
	@@ -211112,14 +211791,11 @@
211791	pParse->aBlob = aNull;
211792	pParse->nBlob = 1;
211793	return 0;
211794	}
211795	case SQLITE_BLOB: {
211796	if( !jsonArgIsJsonb(pArg, pParse) ){



211797	sqlite3_result_error(ctx, "JSON cannot hold BLOB values", -1);
211798	return 1;
211799	}
211800	break;
211801	}
	@@ -211266,31 +211942,50 @@
211942	}
211943
211944	/*
211945	** If pArg is a blob that seems like a JSONB blob, then initialize
211946	** p to point to that JSONB and return TRUE. If pArg does not seem like
211947	** a JSONB blob, then return FALSE.
211948	**
211949	** For small BLOBs (having no more than 7 bytes of payload) a full
211950	** validity check is done. So for small BLOBs this routine only returns
211951	** true if the value is guaranteed to be a valid JSONB. For larger BLOBs
211952	** (8 byte or more of payload) only the size of the outermost element is
211953	** checked to verify that the BLOB is superficially valid JSONB.
211954	**
211955	** A full JSONB validation is done on smaller BLOBs because those BLOBs might
211956	** also be text JSON that has been incorrectly cast into a BLOB.
211957	** (See tag-20240123-a and https://sqlite.org/forum/forumpost/012136abd5)
211958	** If the BLOB is 9 bytes are larger, then it is not possible for the
211959	** superficial size check done here to pass if the input is really text
211960	** JSON so we do not need to look deeper in that case.
211961	**
211962	** Why we only need to do full JSONB validation for smaller BLOBs:
211963	**
211964	** The first byte of valid JSON text must be one of: '{', '[', '"', ' ', '\n',
211965	** '\r', '\t', '-', or a digit '0' through '9'. Of these, only a subset
211966	** can also be the first byte of JSONB: '{', '[', and digits '3'
211967	** through '9'. In every one of those cases, the payload size is 7 bytes
211968	** or less. So if we do full JSONB validation for every BLOB where the
211969	** payload is less than 7 bytes, we will never get a false positive for
211970	** JSONB on an input that is really text JSON.
211971	*/
211972	static int jsonArgIsJsonb(sqlite3_value pArg, JsonParse p){
211973	u32 n, sz = 0;
211974	u8 c;
211975	if( sqlite3_value_type(pArg)!=SQLITE_BLOB ) return 0;
211976	p->aBlob = (u8*)sqlite3_value_blob(pArg);
211977	p->nBlob = (u32)sqlite3_value_bytes(pArg);
211978	if( p->nBlob>0
211979	&& ALWAYS(p->aBlob!=0)
211980	&& ((c = p->aBlob[0]) & 0x0f)<=JSONB_OBJECT





211981	&& (n = jsonbPayloadSize(p, 0, &sz))>0
211982	&& sz+n==p->nBlob
211983	&& ((c & 0x0f)>JSONB_FALSE \|\| sz==0)
211984	&& (sz>7
211985	\|\| (c!=0x7b && c!=0x5b && !sqlite3Isdigit(c))
211986	\|\| jsonbValidityCheck(p, 0, p->nBlob, 1)==0)
211987	){
211988	return 1;
211989	}
211990	p->aBlob = 0;
211991	p->nBlob = 0;
	@@ -212379,25 +213074,21 @@
213074	sqlite3_result_int(ctx, 0);
213075	#endif
213076	return;
213077	}
213078	case SQLITE_BLOB: {
213079	JsonParse py;
213080	memset(&py, 0, sizeof(py));
213081	if( jsonArgIsJsonb(argv[0], &py) ){
213082	if( flags & 0x04 ){
213083	/* Superficial checking only - accomplished by the
213084	** jsonArgIsJsonb() call above. */
213085	res = 1;
213086	}else if( flags & 0x08 ){
213087	/* Strict checking. Check by translating BLOB->TEXT->BLOB. If
213088	** no errors occur, call that a "strict check". */
213089	res = 0==jsonbValidityCheck(&py, 0, py.nBlob, 1);






213090	}
213091	break;
213092	}
213093	/* Fall through into interpreting the input as text. See note
213094	** above at tag-20240123-a. */
	@@ -212451,13 +213142,11 @@
213142
213143	assert( argc==1 );
213144	UNUSED_PARAMETER(argc);
213145	memset(&s, 0, sizeof(s));
213146	s.db = sqlite3_context_db_handle(ctx);
213147	if( jsonArgIsJsonb(argv[0], &s) ){


213148	iErrPos = (i64)jsonbValidityCheck(&s, 0, s.nBlob, 1);
213149	}else{
213150	s.zJson = (char*)sqlite3_value_text(argv[0]);
213151	if( s.zJson==0 ) return; /* NULL input or OOM */
213152	s.nJson = sqlite3_value_bytes(argv[0]);
	@@ -212614,22 +213303,24 @@
213303	const char *z;
213304	u32 n;
213305	UNUSED_PARAMETER(argc);
213306	pStr = (JsonString)sqlite3_aggregate_context(ctx, sizeof(pStr));
213307	if( pStr ){
213308	z = (const char*)sqlite3_value_text(argv[0]);
213309	n = sqlite3Strlen30(z);
213310	if( pStr->zBuf==0 ){
213311	jsonStringInit(pStr, ctx);
213312	jsonAppendChar(pStr, '{');
213313	}else if( pStr->nUsed>1 && z!=0 ){
213314	jsonAppendChar(pStr, ',');
213315	}
213316	pStr->pCtx = ctx;
213317	if( z!=0 ){
213318	jsonAppendString(pStr, z, n);
213319	jsonAppendChar(pStr, ':');
213320	jsonAppendSqlValue(pStr, argv[1]);
213321	}
213322	}
213323	}
213324	static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
213325	JsonString *pStr;
213326	pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
	@@ -213138,13 +213829,12 @@
213829	jsonEachCursorReset(p);
213830	if( idxNum==0 ) return SQLITE_OK;
213831	memset(&p->sParse, 0, sizeof(p->sParse));
213832	p->sParse.nJPRef = 1;
213833	p->sParse.db = p->db;
213834	if( jsonArgIsJsonb(argv[0], &p->sParse) ){
213835	/* We have JSONB */

213836	}else{
213837	p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
213838	p->sParse.nJson = sqlite3_value_bytes(argv[0]);
213839	if( p->sParse.zJson==0 ){
213840	p->i = p->iEnd = 0;
	@@ -213434,10 +214124,12 @@
214124	#else
214125	/* #include "sqlite3.h" */
214126	#endif
214127	SQLITE_PRIVATE int sqlite3GetToken(const unsigned char,int); /* In the SQLite core */
214128
214129	/* #include <stddef.h> */
214130
214131	/*
214132	** If building separately, we will need some setup that is normally
214133	** found in sqliteInt.h
214134	*/
214135	#if !defined(SQLITE_AMALGAMATION)
	@@ -213465,11 +214157,11 @@
214157	#else
214158	# define ALWAYS(X) (X)
214159	# define NEVER(X) (X)
214160	#endif
214161	#ifndef offsetof
214162	# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
214163	#endif
214164	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
214165	# define FLEXARRAY
214166	#else
214167	# define FLEXARRAY 1
	@@ -214503,10 +215195,16 @@
215195	pStmt = pCsr->pReadAux;
215196	memset(pCsr, 0, sizeof(RtreeCursor));
215197	pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
215198	pCsr->pReadAux = pStmt;
215199
215200	/* The following will only fail if the previous sqlite3_step() call failed,
215201	** in which case the error has already been caught. This statement never
215202	** encounters an error within an sqlite3_column_xxx() function, as it
215203	** calls sqlite3_column_value(), which does not use malloc(). So it is safe
215204	** to ignore the error code here. */
215205	sqlite3_reset(pStmt);
215206	}
215207
215208	/*
215209	** Rtree virtual table module xClose method.
215210	*/
	@@ -227782,11 +228480,12 @@
228480	DbpageTable pTab = (DbpageTable )pCursor->pVtab;
228481	int rc;
228482	sqlite3 *db = pTab->db;
228483	Btree *pBt;
228484
228485	UNUSED_PARAMETER(idxStr);
228486	UNUSED_PARAMETER(argc);
228487
228488	/* Default setting is no rows of result */
228489	pCsr->pgno = 1;
228490	pCsr->mxPgno = 0;
228491
	@@ -231444,18 +232143,19 @@
232143	/*
232144	** If the SessionInput object passed as the only argument is a streaming
232145	** object and the buffer is full, discard some data to free up space.
232146	*/
232147	static void sessionDiscardData(SessionInput *pIn){
232148	if( pIn->xInput && pIn->iCurrent>=sessions_strm_chunk_size ){
232149	int nMove = pIn->buf.nBuf - pIn->iCurrent;
232150	assert( nMove>=0 );
232151	if( nMove>0 ){
232152	memmove(pIn->buf.aBuf, &pIn->buf.aBuf[pIn->iCurrent], nMove);
232153	}
232154	pIn->buf.nBuf -= pIn->iCurrent;
232155	pIn->iNext -= pIn->iCurrent;
232156	pIn->iCurrent = 0;
232157	pIn->nData = pIn->buf.nBuf;
232158	}
232159	}
232160
232161	/*
	@@ -231805,12 +232505,12 @@
232505	** sufficient either for the 'T' or 'P' byte and the varint that follows
232506	** it, or for the two single byte values otherwise. */
232507	p->rc = sessionInputBuffer(&p->in, 2);
232508	if( p->rc!=SQLITE_OK ) return p->rc;
232509

232510	p->in.iCurrent = p->in.iNext;
232511	sessionDiscardData(&p->in);
232512
232513	/* If the iterator is already at the end of the changeset, return DONE. */
232514	if( p->in.iNext>=p->in.nData ){
232515	return SQLITE_DONE;
232516	}
	@@ -233229,10 +233929,14 @@
233929	sqlite3_changeset_iter pIter, / Changeset to apply */
233930	int(*xFilter)(
233931	void pCtx, / Copy of sixth arg to _apply() */
233932	const char zTab / Table name */
233933	),
233934	int(*xFilterIter)(
233935	void pCtx, / Copy of sixth arg to _apply() */
233936	sqlite3_changeset_iter *p
233937	),
233938	int(*xConflict)(
233939	void pCtx, / Copy of fifth arg to _apply() */
233940	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
233941	sqlite3_changeset_iter p / Handle describing change and conflict */
233942	),
	@@ -233368,10 +234072,13 @@
234072	}
234073
234074	/* If there is a schema mismatch on the current table, proceed to the
234075	** next change. A log message has already been issued. */
234076	if( schemaMismatch ) continue;
234077
234078	/* If this is a call to apply_v3(), invoke xFilterIter here. */
234079	if( xFilterIter && 0==xFilterIter(pCtx, pIter) ) continue;
234080
234081	rc = sessionApplyOneWithRetry(db, pIter, &sApply, xConflict, pCtx);
234082	}
234083
234084	bPatchset = pIter->bPatchset;
	@@ -233435,10 +234142,91 @@
234142	db->aDb[0].pSchema->schema_cookie -= 32;
234143	}
234144	sqlite3_mutex_leave(sqlite3_db_mutex(db));
234145	return rc;
234146	}
234147
234148	/*
234149	** This function is called by all six sqlite3changeset_apply() variants:
234150	**
234151	** + sqlite3changeset_apply()
234152	** + sqlite3changeset_apply_v2()
234153	** + sqlite3changeset_apply_v3()
234154	** + sqlite3changeset_apply_strm()
234155	** + sqlite3changeset_apply_strm_v2()
234156	** + sqlite3changeset_apply_strm_v3()
234157	**
234158	** Arguments passed to this function are as follows:
234159	**
234160	** db:
234161	** Database handle to apply changeset to main database of.
234162	**
234163	** nChangeset/pChangeset:
234164	** These are both passed zero for the streaming variants. For the normal
234165	** apply() functions, these are passed the size of and the buffer containing
234166	** the changeset, respectively.
234167	**
234168	** xInput/pIn:
234169	** These are both passed zero for the normal variants. For the streaming
234170	** apply() functions, these are passed the input callback and context
234171	** pointer, respectively.
234172	**
234173	** xFilter:
234174	** The filter function as passed to apply() or apply_v2() (to filter by
234175	** table name), if any. This is always NULL for apply_v3() calls.
234176	**
234177	** xFilterIter:
234178	** The filter function as passed to apply_v3(), if any.
234179	**
234180	** xConflict:
234181	** The conflict handler callback (must not be NULL).
234182	**
234183	** pCtx:
234184	** The context pointer passed to the xFilter and xConflict handler callbacks.
234185	**
234186	** ppRebase, pnRebase:
234187	** Zero for apply(). The rebase changeset output pointers, if any, for
234188	** apply_v2() and apply_v3().
234189	**
234190	** flags:
234191	** Zero for apply(). The flags parameter for apply_v2() and apply_v3().
234192	*/
234193	static int sessionChangesetApplyV23(
234194	sqlite3 db, / Apply change to "main" db of this handle */
234195	int nChangeset, /* Size of changeset in bytes */
234196	void pChangeset, / Changeset blob */
234197	int (xInput)(void pIn, void pData, int pnData), /* Input function */
234198	void pIn, / First arg for xInput */
234199	int(*xFilter)(
234200	void pCtx, / Copy of sixth arg to _apply() */
234201	const char zTab / Table name */
234202	),
234203	int(*xFilterIter)(
234204	void pCtx, / Copy of sixth arg to _apply() */
234205	sqlite3_changeset_iter p / Handle describing current change */
234206	),
234207	int(*xConflict)(
234208	void pCtx, / Copy of sixth arg to _apply() */
234209	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
234210	sqlite3_changeset_iter p / Handle describing change and conflict */
234211	),
234212	void pCtx, / First argument passed to xConflict */
234213	void *ppRebase, int pnRebase,
234214	int flags
234215	){
234216	sqlite3_changeset_iter pIter; / Iterator to skip through changeset */
234217	int bInverse = !!(flags & SQLITE_CHANGESETAPPLY_INVERT);
234218	int rc = sessionChangesetStart(
234219	&pIter, xInput, pIn, nChangeset, pChangeset, bInverse, 1
234220	);
234221	if( rc==SQLITE_OK ){
234222	rc = sessionChangesetApply(db, pIter,
234223	xFilter, xFilterIter, xConflict, pCtx, ppRebase, pnRebase, flags
234224	);
234225	}
234226	return rc;
234227	}
234228
234229	/*
234230	** Apply the changeset passed via pChangeset/nChangeset to the main
234231	** database attached to handle "db".
234232	*/
	@@ -233457,21 +234245,43 @@
234245	),
234246	void pCtx, / First argument passed to xConflict */
234247	void *ppRebase, int pnRebase,
234248	int flags
234249	){
234250	return sessionChangesetApplyV23(db,
234251	nChangeset, pChangeset, 0, 0,
234252	xFilter, 0, xConflict, pCtx,
234253	ppRebase, pnRebase, flags
234254	);
234255	}
234256
234257	/*
234258	** Apply the changeset passed via pChangeset/nChangeset to the main
234259	** database attached to handle "db".
234260	*/
234261	SQLITE_API int sqlite3changeset_apply_v3(
234262	sqlite3 db, / Apply change to "main" db of this handle */
234263	int nChangeset, /* Size of changeset in bytes */
234264	void pChangeset, / Changeset blob */
234265	int(*xFilter)(
234266	void pCtx, / Copy of sixth arg to _apply() */
234267	sqlite3_changeset_iter p / Handle describing current change */
234268	),
234269	int(*xConflict)(
234270	void pCtx, / Copy of sixth arg to _apply() */
234271	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
234272	sqlite3_changeset_iter p / Handle describing change and conflict */
234273	),
234274	void pCtx, / First argument passed to xConflict */
234275	void *ppRebase, int pnRebase,
234276	int flags
234277	){
234278	return sessionChangesetApplyV23(db,
234279	nChangeset, pChangeset, 0, 0,
234280	0, xFilter, xConflict, pCtx,
234281	ppRebase, pnRebase, flags
234282	);
234283	}
234284
234285	/*
234286	** Apply the changeset passed via pChangeset/nChangeset to the main database
234287	** attached to handle "db". Invoke the supplied conflict handler callback
	@@ -233490,20 +234300,45 @@
234300	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
234301	sqlite3_changeset_iter p / Handle describing change and conflict */
234302	),
234303	void pCtx / First argument passed to xConflict */
234304	){
234305	return sessionChangesetApplyV23(db,
234306	nChangeset, pChangeset, 0, 0,
234307	xFilter, 0, xConflict, pCtx,
234308	0, 0, 0
234309	);
234310	}
234311
234312	/*
234313	** Apply the changeset passed via xInput/pIn to the main database
234314	** attached to handle "db". Invoke the supplied conflict handler callback
234315	** to resolve any conflicts encountered while applying the change.
234316	*/
234317	SQLITE_API int sqlite3changeset_apply_v3_strm(
234318	sqlite3 db, / Apply change to "main" db of this handle */
234319	int (xInput)(void pIn, void pData, int pnData), /* Input function */
234320	void pIn, / First arg for xInput */
234321	int(*xFilter)(
234322	void pCtx, / Copy of sixth arg to _apply() */
234323	sqlite3_changeset_iter *p
234324	),
234325	int(*xConflict)(
234326	void pCtx, / Copy of sixth arg to _apply() */
234327	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
234328	sqlite3_changeset_iter p / Handle describing change and conflict */
234329	),
234330	void pCtx, / First argument passed to xConflict */
234331	void *ppRebase, int pnRebase,
234332	int flags
234333	){
234334	return sessionChangesetApplyV23(db,
234335	0, 0, xInput, pIn,
234336	0, xFilter, xConflict, pCtx,
234337	ppRebase, pnRebase, flags
234338	);
234339	}
234340	SQLITE_API int sqlite3changeset_apply_v2_strm(
234341	sqlite3 db, / Apply change to "main" db of this handle */
234342	int (xInput)(void pIn, void pData, int pnData), /* Input function */
234343	void pIn, / First arg for xInput */
234344	int(*xFilter)(
	@@ -233517,19 +234352,15 @@
234352	),
234353	void pCtx, / First argument passed to xConflict */
234354	void *ppRebase, int pnRebase,
234355	int flags
234356	){
234357	return sessionChangesetApplyV23(db,
234358	0, 0, xInput, pIn,
234359	xFilter, 0, xConflict, pCtx,
234360	ppRebase, pnRebase, flags
234361	);




234362	}
234363	SQLITE_API int sqlite3changeset_apply_strm(
234364	sqlite3 db, / Apply change to "main" db of this handle */
234365	int (xInput)(void pIn, void pData, int pnData), /* Input function */
234366	void pIn, / First arg for xInput */
	@@ -233542,12 +234373,14 @@
234373	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
234374	sqlite3_changeset_iter p / Handle describing change and conflict */
234375	),
234376	void pCtx / First argument passed to xConflict */
234377	){
234378	return sessionChangesetApplyV23(db,
234379	0, 0, xInput, pIn,
234380	xFilter, 0, xConflict, pCtx,
234381	0, 0, 0
234382	);
234383	}
234384
234385	/*
234386	** sqlite3_changegroup handle.
	@@ -234165,18 +234998,23 @@
234998	*/
234999	SQLITE_API int sqlite3changegroup_add_change(
235000	sqlite3_changegroup *pGrp,
235001	sqlite3_changeset_iter *pIter
235002	){
235003	int rc = SQLITE_OK;
235004
235005	if( pIter->in.iCurrent==pIter->in.iNext
235006	\|\| pIter->rc!=SQLITE_OK
235007	\|\| pIter->bInvert
235008	){
235009	/* Iterator does not point to any valid entry or is an INVERT iterator. */
235010	rc = SQLITE_ERROR;
235011	}else{
235012	pIter->in.bNoDiscard = 1;
235013	rc = sessionOneChangeToHash(pGrp, pIter, 0);
235014	}
235015	return rc;
235016	}
235017
235018	/*
235019	** Obtain a buffer containing a changeset representing the concatenation
235020	** of all changesets added to the group so far.
	@@ -235470,10 +236308,11 @@
236308	/* #include "sqlite3ext.h" */
236309	SQLITE_EXTENSION_INIT1
236310
236311	/* #include <string.h> */
236312	/* #include <assert.h> */
236313	/* #include <stddef.h> */
236314
236315	#ifndef SQLITE_AMALGAMATION
236316
236317	typedef unsigned char u8;
236318	typedef unsigned int u32;
	@@ -235529,11 +236368,11 @@
236368
236369	/*
236370	** Macros needed to provide flexible arrays in a portable way
236371	*/
236372	#ifndef offsetof
236373	# define offsetof(ST,M) ((size_t)((char)&((ST)0)->M - (char*)0))
236374	#endif
236375	#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
236376	# define FLEXARRAY
236377	#else
236378	# define FLEXARRAY 1
	@@ -244713,10 +245552,40 @@
245552	Fts5Buffer term; /* Current term */
245553	i64 iRowid; /* Current rowid */
245554	int nPos; /* Number of bytes in current position list */
245555	u8 bDel; /* True if the delete flag is set */
245556	};
245557
245558	static int fts5IndexCorruptRowid(Fts5Index *pIdx, i64 iRowid){
245559	pIdx->rc = FTS5_CORRUPT;
245560	sqlite3Fts5ConfigErrmsg(pIdx->pConfig,
245561	"fts5: corruption found reading blob %lld from table \"%s\"",
245562	iRowid, pIdx->pConfig->zName
245563	);
245564	return SQLITE_CORRUPT_VTAB;
245565	}
245566	#define FTS5_CORRUPT_ROWID(pIdx, iRowid) fts5IndexCorruptRowid(pIdx, iRowid)
245567
245568	static int fts5IndexCorruptIter(Fts5Index pIdx, Fts5SegIter pIter){
245569	pIdx->rc = FTS5_CORRUPT;
245570	sqlite3Fts5ConfigErrmsg(pIdx->pConfig,
245571	"fts5: corruption on page %d, segment %d, table \"%s\"",
245572	pIter->iLeafPgno, pIter->pSeg->iSegid, pIdx->pConfig->zName
245573	);
245574	return SQLITE_CORRUPT_VTAB;
245575	}
245576	#define FTS5_CORRUPT_ITER(pIdx, pIter) fts5IndexCorruptIter(pIdx, pIter)
245577
245578	static int fts5IndexCorruptIdx(Fts5Index *pIdx){
245579	pIdx->rc = FTS5_CORRUPT;
245580	sqlite3Fts5ConfigErrmsg(pIdx->pConfig,
245581	"fts5: corruption in table \"%s\"", pIdx->pConfig->zName
245582	);
245583	return SQLITE_CORRUPT_VTAB;
245584	}
245585	#define FTS5_CORRUPT_IDX(pIdx) fts5IndexCorruptIdx(pIdx)
245586
245587
245588	/*
245589	** Array of tombstone pages. Reference counted.
245590	*/
245591	struct Fts5TombstoneArray {
	@@ -245003,11 +245872,11 @@
245872	/* If either of the sqlite3_blob_open() or sqlite3_blob_reopen() calls
245873	** above returned SQLITE_ERROR, return SQLITE_CORRUPT_VTAB instead.
245874	** All the reasons those functions might return SQLITE_ERROR - missing
245875	** table, missing row, non-blob/text in block column - indicate
245876	** backing store corruption. */
245877	if( rc==SQLITE_ERROR ) rc = FTS5_CORRUPT_ROWID(p, iRowid);
245878
245879	if( rc==SQLITE_OK ){
245880	u8 aOut = 0; / Read blob data into this buffer */
245881	int nByte = sqlite3_blob_bytes(p->pReader);
245882	int szData = (sizeof(Fts5Data) + 7) & ~7;
	@@ -245053,11 +245922,11 @@
245922
245923	static Fts5Data fts5LeafRead(Fts5Index p, i64 iRowid){
245924	Fts5Data *pRet = fts5DataRead(p, iRowid);
245925	if( pRet ){
245926	if( pRet->nn<4 \|\| pRet->szLeaf>pRet->nn ){
245927	FTS5_CORRUPT_ROWID(p, iRowid);
245928	fts5DataRelease(pRet);
245929	pRet = 0;
245930	}
245931	}
245932	return pRet;
	@@ -245412,12 +246281,18 @@
246281	pData = fts5DataRead(p, FTS5_STRUCTURE_ROWID);
246282	if( p->rc==SQLITE_OK ){
246283	/* TODO: Do we need this if the leaf-index is appended? Probably... */
246284	memset(&pData->p[pData->nn], 0, FTS5_DATA_PADDING);
246285	p->rc = fts5StructureDecode(pData->p, pData->nn, &iCookie, &pRet);
246286	if( p->rc==SQLITE_OK ){
246287	if( (pConfig->pgsz==0 \|\| pConfig->iCookie!=iCookie) ){
246288	p->rc = sqlite3Fts5ConfigLoad(pConfig, iCookie);
246289	}
246290	}else if( p->rc==SQLITE_CORRUPT_VTAB ){
246291	sqlite3Fts5ConfigErrmsg(p->pConfig,
246292	"fts5: corrupt structure record for table \"%s\"", p->pConfig->zName
246293	);
246294	}
246295	fts5DataRelease(pData);
246296	if( p->rc!=SQLITE_OK ){
246297	fts5StructureRelease(pRet);
246298	pRet = 0;
	@@ -246036,11 +246911,11 @@
246911
246912	ASSERT_SZLEAF_OK(pIter->pLeaf);
246913	while( iOff>=pIter->pLeaf->szLeaf ){
246914	fts5SegIterNextPage(p, pIter);
246915	if( pIter->pLeaf==0 ){
246916	if( p->rc==SQLITE_OK ) FTS5_CORRUPT_ITER(p, pIter);
246917	return;
246918	}
246919	iOff = 4;
246920	a = pIter->pLeaf->p;
246921	}
	@@ -246068,11 +246943,11 @@
246943	i64 iOff = pIter->iLeafOffset; /* Offset to read at */
246944	int nNew; /* Bytes of new data */
246945
246946	iOff += fts5GetVarint32(&a[iOff], nNew);
246947	if( iOff+nNew>pIter->pLeaf->szLeaf \|\| nKeep>pIter->term.n \|\| nNew==0 ){
246948	FTS5_CORRUPT_ITER(p, pIter);
246949	return;
246950	}
246951	pIter->term.n = nKeep;
246952	fts5BufferAppendBlob(&p->rc, &pIter->term, nNew, &a[iOff]);
246953	assert( pIter->term.n<=pIter->term.nSpace );
	@@ -246110,13 +246985,13 @@
246985	** Allocate a tombstone hash page array object (pIter->pTombArray) for
246986	** the iterator passed as the second argument. If an OOM error occurs,
246987	** leave an error in the Fts5Index object.
246988	*/
246989	static void fts5SegIterAllocTombstone(Fts5Index p, Fts5SegIter pIter){
246990	const i64 nTomb = (i64)pIter->pSeg->nPgTombstone;
246991	if( nTomb>0 ){
246992	i64 nByte = SZ_FTS5TOMBSTONEARRAY(nTomb+1);
246993	Fts5TombstoneArray *pNew;
246994	pNew = (Fts5TombstoneArray*)sqlite3Fts5MallocZero(&p->rc, nByte);
246995	if( pNew ){
246996	pNew->nTombstone = nTomb;
246997	pNew->nRef = 1;
	@@ -246263,11 +247138,11 @@
247138	}else{
247139	int iRowidOff;
247140	iRowidOff = fts5LeafFirstRowidOff(pNew);
247141	if( iRowidOff ){
247142	if( iRowidOff>=pNew->szLeaf ){
247143	FTS5_CORRUPT_ITER(p, pIter);
247144	}else{
247145	pIter->pLeaf = pNew;
247146	pIter->iLeafOffset = iRowidOff;
247147	}
247148	}
	@@ -246497,11 +247372,11 @@
247372	pIter->iEndofDoclist = iOff;
247373	bNewTerm = 1;
247374	}
247375	assert_nc( iOff<pLeaf->szLeaf );
247376	if( iOff>pLeaf->szLeaf ){
247377	FTS5_CORRUPT_ITER(p, pIter);
247378	return;
247379	}
247380	}
247381	}
247382
	@@ -246605,22 +247480,24 @@
247480	if( pLast ){
247481	int iOff;
247482	fts5DataRelease(pIter->pLeaf);
247483	pIter->pLeaf = pLast;
247484	pIter->iLeafPgno = pgnoLast;
247485	if( p->rc==SQLITE_OK ){
247486	iOff = fts5LeafFirstRowidOff(pLast);
247487	if( iOff>pLast->szLeaf ){
247488	FTS5_CORRUPT_ITER(p, pIter);
247489	return;
247490	}
247491	iOff += fts5GetVarint(&pLast->p[iOff], (u64*)&pIter->iRowid);
247492	pIter->iLeafOffset = iOff;
247493
247494	if( fts5LeafIsTermless(pLast) ){
247495	pIter->iEndofDoclist = pLast->nn+1;
247496	}else{
247497	pIter->iEndofDoclist = fts5LeafFirstTermOff(pLast);
247498	}
247499	}
247500	}
247501
247502	fts5SegIterReverseInitPage(p, pIter);
247503	}
	@@ -246686,11 +247563,11 @@
247563
247564	iPgidx = (u32)pIter->pLeaf->szLeaf;
247565	iPgidx += fts5GetVarint32(&a[iPgidx], iTermOff);
247566	iOff = iTermOff;
247567	if( iOff>n ){
247568	FTS5_CORRUPT_ITER(p, pIter);
247569	return;
247570	}
247571
247572	while( 1 ){
247573
	@@ -246729,11 +247606,11 @@
247606	iPgidx += fts5GetVarint32(&a[iPgidx], nKeep);
247607	iTermOff += nKeep;
247608	iOff = iTermOff;
247609
247610	if( iOff>=n ){
247611	FTS5_CORRUPT_ITER(p, pIter);
247612	return;
247613	}
247614
247615	/* Read the nKeep field of the next term. */
247616	fts5FastGetVarint32(a, iOff, nKeep);
	@@ -246751,11 +247628,11 @@
247628	a = pIter->pLeaf->p;
247629	if( fts5LeafIsTermless(pIter->pLeaf)==0 ){
247630	iPgidx = (u32)pIter->pLeaf->szLeaf;
247631	iPgidx += fts5GetVarint32(&pIter->pLeaf->p[iPgidx], iOff);
247632	if( iOff<4 \|\| (i64)iOff>=pIter->pLeaf->szLeaf ){
247633	FTS5_CORRUPT_ITER(p, pIter);
247634	return;
247635	}else{
247636	nKeep = 0;
247637	iTermOff = iOff;
247638	n = (u32)pIter->pLeaf->nn;
	@@ -246766,11 +247643,11 @@
247643	}while( 1 );
247644	}
247645
247646	search_success:
247647	if( (i64)iOff+nNew>n \|\| nNew<1 ){
247648	FTS5_CORRUPT_ITER(p, pIter);
247649	return;
247650	}
247651	pIter->iLeafOffset = iOff + nNew;
247652	pIter->iTermLeafOffset = pIter->iLeafOffset;
247653	pIter->iTermLeafPgno = pIter->iLeafPgno;
	@@ -247231,11 +248108,11 @@
248108	int iLeafPgno
248109	){
248110	assert( iLeafPgno>pIter->iLeafPgno );
248111
248112	if( iLeafPgno>pIter->pSeg->pgnoLast ){
248113	FTS5_CORRUPT_IDX(p);
248114	}else{
248115	fts5DataRelease(pIter->pNextLeaf);
248116	pIter->pNextLeaf = 0;
248117	pIter->iLeafPgno = iLeafPgno-1;
248118
	@@ -247246,11 +248123,11 @@
248123	iOff = fts5LeafFirstRowidOff(pIter->pLeaf);
248124	if( iOff>0 ){
248125	u8 *a = pIter->pLeaf->p;
248126	int n = pIter->pLeaf->szLeaf;
248127	if( iOff<4 \|\| iOff>=n ){
248128	FTS5_CORRUPT_IDX(p);
248129	}else{
248130	iOff += fts5GetVarint(&a[iOff], (u64*)&pIter->iRowid);
248131	pIter->iLeafOffset = iOff;
248132	fts5SegIterLoadNPos(p, pIter);
248133	}
	@@ -247725,11 +248602,11 @@
248602	nRem -= nChunk;
248603	fts5DataRelease(pData);
248604	if( nRem<=0 ){
248605	break;
248606	}else if( pSeg->pSeg==0 ){
248607	FTS5_CORRUPT_IDX(p);
248608	return;
248609	}else{
248610	pgno++;
248611	pData = fts5LeafRead(p, FTS5_SEGMENT_ROWID(pSeg->pSeg->iSegid, pgno));
248612	if( pData==0 ) break;
	@@ -248828,11 +249705,11 @@
249705	if( iOff>pData->szLeaf ){
249706	/* This can occur if the pages that the segments occupy overlap - if
249707	** a single page has been assigned to more than one segment. In
249708	** this case a prior iteration of this loop may have corrupted the
249709	** segment currently being trimmed. */
249710	FTS5_CORRUPT_ROWID(p, iLeafRowid);
249711	}else{
249712	fts5BufferZero(&buf);
249713	fts5BufferGrow(&p->rc, &buf, pData->nn);
249714	fts5BufferAppendBlob(&p->rc, &buf, sizeof(aHdr), aHdr);
249715	fts5BufferAppendVarint(&p->rc, &buf, pSeg->term.n);
	@@ -249295,11 +250172,11 @@
250172	fts5DataRelease(pLeaf);
250173	pLeaf = 0;
250174	}else if( bDetailNone ){
250175	break;
250176	}else if( iNext>=pLeaf->szLeaf \|\| pLeaf->nn<pLeaf->szLeaf \|\| iNext<4 ){
250177	FTS5_CORRUPT_ROWID(p, iRowid);
250178	break;
250179	}else{
250180	int nShift = iNext - 4;
250181	int nPg;
250182
	@@ -249315,11 +250192,11 @@
250192	int i1 = pLeaf->szLeaf;
250193	int i2 = 0;
250194
250195	i1 += fts5GetVarint32(&aPg[i1], iFirst);
250196	if( iFirst<iNext ){
250197	FTS5_CORRUPT_ROWID(p, iRowid);
250198	break;
250199	}
250200	aIdx = sqlite3Fts5MallocZero(&p->rc, (pLeaf->nn-pLeaf->szLeaf)+2);
250201	if( aIdx==0 ) break;
250202	i2 = sqlite3Fts5PutVarint(aIdx, iFirst-nShift);
	@@ -249538,18 +250415,18 @@
250415
250416	nPrefix = MIN(nPrefix, nPrefix2);
250417	nSuffix = (nPrefix2 + nSuffix2) - nPrefix;
250418
250419	if( (iKeyOff+nSuffix)>iPgIdx \|\| (iNextOff+nSuffix2)>iPgIdx ){
250420	FTS5_CORRUPT_IDX(p);
250421	}else{
250422	if( iKey!=1 ){
250423	iOff += sqlite3Fts5PutVarint(&aPg[iOff], nPrefix);
250424	}
250425	iOff += sqlite3Fts5PutVarint(&aPg[iOff], nSuffix);
250426	if( nPrefix2>pSeg->term.n ){
250427	FTS5_CORRUPT_IDX(p);
250428	}else if( nPrefix2>nPrefix ){
250429	memcpy(&aPg[iOff], &pSeg->term.p[nPrefix], nPrefix2-nPrefix);
250430	iOff += (nPrefix2-nPrefix);
250431	}
250432	memmove(&aPg[iOff], &aPg[iNextOff], nSuffix2);
	@@ -249969,11 +250846,11 @@
250846	}
250847	assert( pStruct->aLevel[i].nMerge<=nThis );
250848	}
250849
250850	nByte += (((i64)pStruct->nLevel)+1) * sizeof(Fts5StructureLevel);
250851	assert( nByte==(i64)SZ_FTS5STRUCTURE(pStruct->nLevel+2) );
250852	pNew = (Fts5Structure*)sqlite3Fts5MallocZero(&p->rc, nByte);
250853
250854	if( pNew ){
250855	Fts5StructureLevel *pLvl;
250856	nByte = nSeg * sizeof(Fts5StructureSegment);
	@@ -250338,11 +251215,11 @@
251215	fts5PrefixMergerInsertByPosition(&pHead, pSave);
251216	pSave = pNext;
251217	}
251218
251219	if( pHead==0 \|\| pHead->pNext==0 ){
251220	FTS5_CORRUPT_IDX(p);
251221	break;
251222	}
251223
251224	/* See the earlier comment in this function for an explanation of why
251225	** corrupt input position lists might cause the output to consume
	@@ -250375,11 +251252,11 @@
251252
251253	/* WRITEPOSLISTSIZE */
251254	assert_nc( tmp.n+nTail<=nTmp );
251255	assert( tmp.n+nTail<=nTmp+nMerge*10 );
251256	if( tmp.n+nTail>nTmp-FTS5_DATA_ZERO_PADDING ){
251257	if( p->rc==SQLITE_OK ) FTS5_CORRUPT_IDX(p);
251258	break;
251259	}
251260	fts5BufferSafeAppendVarint(&out, (tmp.n+nTail) * 2);
251261	fts5BufferSafeAppendBlob(&out, tmp.p, tmp.n);
251262	if( nTail>0 ){
	@@ -252408,23 +253285,31 @@
253285	}
253286
253287	/*
253288	** This function is also purely an internal test. It does not contribute to
253289	** FTS functionality, or even the integrity-check, in any way.
253290	**
253291	** This function sets output variable (*pbFail) to true if the test fails. Or
253292	** leaves it unchanged if the test succeeds.
253293	*/
253294	static void fts5TestTerm(
253295	Fts5Index *p,
253296	Fts5Buffer pPrev, / Previous term */
253297	const char z, int n, / Possibly new term to test */
253298	u64 expected,
253299	u64 *pCksum,
253300	int *pbFail
253301	){
253302	int rc = p->rc;
253303	if( pPrev->n==0 ){
253304	fts5BufferSet(&rc, pPrev, n, (const u8*)z);
253305	}else
253306	if( *pbFail==0
253307	&& rc==SQLITE_OK
253308	&& (pPrev->n!=n \|\| memcmp(pPrev->p, z, n))
253309	&& (p->pHash==0 \|\| p->pHash->nEntry==0)
253310	){
253311	u64 cksum3 = *pCksum;
253312	const char zTerm = (const char)&pPrev->p[1]; /* term sans prefix-byte */
253313	int nTerm = pPrev->n-1; /* Size of zTerm in bytes */
253314	int iIdx = (pPrev->p[0] - FTS5_MAIN_PREFIX);
253315	int flags = (iIdx==0 ? 0 : FTS5INDEX_QUERY_PREFIX);
	@@ -252470,20 +253355,20 @@
253355
253356	cksum3 ^= ck1;
253357	fts5BufferSet(&rc, pPrev, n, (const u8*)z);
253358
253359	if( rc==SQLITE_OK && cksum3!=expected ){
253360	*pbFail = 1;
253361	}
253362	*pCksum = cksum3;
253363	}
253364	p->rc = rc;
253365	}
253366
253367	#else
253368	# define fts5TestDlidxReverse(x,y,z)
253369	# define fts5TestTerm(t,u,v,w,x,y,z)
253370	#endif
253371
253372	/*
253373	** Check that:
253374	**
	@@ -252504,18 +253389,21 @@
253389	/* Now check that the iter.nEmpty leaves following the current leaf
253390	** (a) exist and (b) contain no terms. */
253391	for(i=iFirst; p->rc==SQLITE_OK && i<=iLast; i++){
253392	Fts5Data *pLeaf = fts5DataRead(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
253393	if( pLeaf ){
253394	if( !fts5LeafIsTermless(pLeaf)
253395	\|\| (i>=iNoRowid && 0!=fts5LeafFirstRowidOff(pLeaf))
253396	){
253397	FTS5_CORRUPT_ROWID(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, i));
253398	}
253399	}
253400	fts5DataRelease(pLeaf);
253401	}
253402	}
253403
253404	static void fts5IntegrityCheckPgidx(Fts5Index p, i64 iRowid, Fts5Data pLeaf){
253405	i64 iTermOff = 0;
253406	int ii;
253407
253408	Fts5Buffer buf1 = {0,0,0};
253409	Fts5Buffer buf2 = {0,0,0};
	@@ -252529,33 +253417,33 @@
253417	ii += fts5GetVarint32(&pLeaf->p[ii], nIncr);
253418	iTermOff += nIncr;
253419	iOff = iTermOff;
253420
253421	if( iOff>=pLeaf->szLeaf ){
253422	FTS5_CORRUPT_ROWID(p, iRowid);
253423	}else if( iTermOff==nIncr ){
253424	int nByte;
253425	iOff += fts5GetVarint32(&pLeaf->p[iOff], nByte);
253426	if( (iOff+nByte)>pLeaf->szLeaf ){
253427	FTS5_CORRUPT_ROWID(p, iRowid);
253428	}else{
253429	fts5BufferSet(&p->rc, &buf1, nByte, &pLeaf->p[iOff]);
253430	}
253431	}else{
253432	int nKeep, nByte;
253433	iOff += fts5GetVarint32(&pLeaf->p[iOff], nKeep);
253434	iOff += fts5GetVarint32(&pLeaf->p[iOff], nByte);
253435	if( nKeep>buf1.n \|\| (iOff+nByte)>pLeaf->szLeaf ){
253436	FTS5_CORRUPT_ROWID(p, iRowid);
253437	}else{
253438	buf1.n = nKeep;
253439	fts5BufferAppendBlob(&p->rc, &buf1, nByte, &pLeaf->p[iOff]);
253440	}
253441
253442	if( p->rc==SQLITE_OK ){
253443	res = fts5BufferCompare(&buf1, &buf2);
253444	if( res<=0 ) FTS5_CORRUPT_ROWID(p, iRowid);
253445	}
253446	}
253447	fts5BufferSet(&p->rc, &buf2, buf1.n, buf1.p);
253448	}
253449
	@@ -252612,11 +253500,11 @@
253500	){
253501	/* special case - the very first page in a segment keeps its %_idx
253502	** entry even if all the terms are removed from it by secure-delete
253503	** operations. */
253504	}else{
253505	FTS5_CORRUPT_ROWID(p, iRow);
253506	}
253507
253508	}else{
253509	int iOff; /* Offset of first term on leaf */
253510	int iRowidOff; /* Offset of first rowid on leaf */
	@@ -252624,19 +253512,19 @@
253512	int res; /* Comparison of term and split-key */
253513
253514	iOff = fts5LeafFirstTermOff(pLeaf);
253515	iRowidOff = fts5LeafFirstRowidOff(pLeaf);
253516	if( iRowidOff>=iOff \|\| iOff>=pLeaf->szLeaf ){
253517	FTS5_CORRUPT_ROWID(p, iRow);
253518	}else{
253519	iOff += fts5GetVarint32(&pLeaf->p[iOff], nTerm);
253520	res = fts5Memcmp(&pLeaf->p[iOff], zIdxTerm, MIN(nTerm, nIdxTerm));
253521	if( res==0 ) res = nTerm - nIdxTerm;
253522	if( res<0 ) FTS5_CORRUPT_ROWID(p, iRow);
253523	}
253524
253525	fts5IntegrityCheckPgidx(p, iRow, pLeaf);
253526	}
253527	fts5DataRelease(pLeaf);
253528	if( p->rc ) break;
253529
253530	/* Now check that the iter.nEmpty leaves following the current leaf
	@@ -252662,11 +253550,11 @@
253550	/* Check any rowid-less pages that occur before the current leaf. */
253551	for(iPg=iPrevLeaf+1; iPg<fts5DlidxIterPgno(pDlidx); iPg++){
253552	iKey = FTS5_SEGMENT_ROWID(iSegid, iPg);
253553	pLeaf = fts5DataRead(p, iKey);
253554	if( pLeaf ){
253555	if( fts5LeafFirstRowidOff(pLeaf)!=0 ) FTS5_CORRUPT_ROWID(p, iKey);
253556	fts5DataRelease(pLeaf);
253557	}
253558	}
253559	iPrevLeaf = fts5DlidxIterPgno(pDlidx);
253560
	@@ -252677,16 +253565,16 @@
253565	if( pLeaf ){
253566	i64 iRowid;
253567	int iRowidOff = fts5LeafFirstRowidOff(pLeaf);
253568	ASSERT_SZLEAF_OK(pLeaf);
253569	if( iRowidOff>=pLeaf->szLeaf ){
253570	FTS5_CORRUPT_ROWID(p, iKey);
253571	}else if( bSecureDelete==0 \|\| iRowidOff>0 ){
253572	i64 iDlRowid = fts5DlidxIterRowid(pDlidx);
253573	fts5GetVarint(&pLeaf->p[iRowidOff], (u64*)&iRowid);
253574	if( iRowid<iDlRowid \|\| (bSecureDelete==0 && iRowid!=iDlRowid) ){
253575	FTS5_CORRUPT_ROWID(p, iKey);
253576	}
253577	}
253578	fts5DataRelease(pLeaf);
253579	}
253580	}
	@@ -252734,10 +253622,11 @@
253622
253623	#ifdef SQLITE_DEBUG
253624	/* Used by extra internal tests only run if NDEBUG is not defined */
253625	u64 cksum3 = 0; /* Checksum based on contents of indexes */
253626	Fts5Buffer term = {0,0,0}; /* Buffer used to hold most recent term */
253627	int bTestFail = 0;
253628	#endif
253629	const int flags = FTS5INDEX_QUERY_NOOUTPUT;
253630
253631	/* Load the FTS index structure */
253632	pStruct = fts5StructureRead(p);
	@@ -252776,11 +253665,11 @@
253665	int iOff = 0; /* Offset within poslist */
253666	i64 iRowid = fts5MultiIterRowid(pIter);
253667	char z = (char)fts5MultiIterTerm(pIter, &n);
253668
253669	/* If this is a new term, query for it. Update cksum3 with the results. */
253670	fts5TestTerm(p, &term, z, n, cksum2, &cksum3, &bTestFail);
253671	if( p->rc ) break;
253672
253673	if( eDetail==FTS5_DETAIL_NONE ){
253674	if( 0==fts5MultiIterIsEmpty(p, pIter) ){
253675	cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n);
	@@ -252794,19 +253683,30 @@
253683	int iTokOff = FTS5_POS2OFFSET(iPos);
253684	cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, iCol, iTokOff, -1, z, n);
253685	}
253686	}
253687	}
253688	fts5TestTerm(p, &term, 0, 0, cksum2, &cksum3, &bTestFail);
253689
253690	fts5MultiIterFree(pIter);
253691	if( p->rc==SQLITE_OK && bUseCksum && cksum!=cksum2 ){
253692	p->rc = FTS5_CORRUPT;
253693	sqlite3Fts5ConfigErrmsg(p->pConfig,
253694	"fts5: checksum mismatch for table \"%s\"", p->pConfig->zName
253695	);
253696	}
253697	#ifdef SQLITE_DEBUG
253698	/* In SQLITE_DEBUG builds, expensive extra checks were run as part of
253699	** the integrity-check above. If no other errors were detected, but one
253700	** of these tests failed, set the result to SQLITE_CORRUPT_VTAB here. */
253701	if( p->rc==SQLITE_OK && bTestFail ){
253702	p->rc = FTS5_CORRUPT;
253703	}
253704	fts5BufferFree(&term);
253705	#endif
253706
253707	fts5StructureRelease(pStruct);
253708	fts5BufferFree(&poslist);
253709	return fts5IndexReturn(p);
253710	}
253711
253712	/*************************************************************************
	@@ -257213,11 +258113,11 @@
258113	int nArg, /* Number of args */
258114	sqlite3_value *apUnused / Function arguments */
258115	){
258116	assert( nArg==0 );
258117	UNUSED_PARAM2(nArg, apUnused);
258118	sqlite3_result_text(pCtx, "fts5: 2025-07-15 19:00:01 9f184f8dfa5ef6d57e10376adc30e0060ceda07d283c23dfdfe3dbdd6608f839", -1, SQLITE_TRANSIENT);
258119	}
258120
258121	/*
258122	** Implementation of fts5_locale(LOCALE, TEXT) function.
258123	**
	@@ -257336,12 +258236,13 @@
258236	}else{
258237	*pzErr = sqlite3_mprintf("unable to validate the inverted index for"
258238	" FTS5 table %s.%s: %s",
258239	zSchema, zTabname, sqlite3_errstr(rc));
258240	}
258241	}else if( (rc&0xff)==SQLITE_CORRUPT ){
258242	rc = SQLITE_OK;
258243	}

258244	sqlite3Fts5IndexCloseReader(pTab->p.pIndex);
258245	pTab->p.pConfig->pzErrmsg = 0;
258246
258247	return rc;
258248	}
	@@ -258028,10 +258929,11 @@
258929	ctx.pStorage = p;
258930	ctx.iCol = -1;
258931	for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){
258932	if( pConfig->abUnindexed[iCol-1]==0 ){
258933	sqlite3_value *pVal = 0;
258934	sqlite3_value *pFree = 0;
258935	const char *pText = 0;
258936	int nText = 0;
258937	const char *pLoc = 0;
258938	int nLoc = 0;
258939
	@@ -258044,15 +258946,26 @@
258946	}
258947
258948	if( pConfig->bLocale && sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
258949	rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
258950	}else{
258951	if( sqlite3_value_type(pVal)!=SQLITE_TEXT ){
258952	/* Make a copy of the value to work with. This is because the call
258953	** to sqlite3_value_text() below forces the type of the value to
258954	** SQLITE_TEXT, and we may need to use it again later. */
258955	pFree = pVal = sqlite3_value_dup(pVal);
258956	if( pVal==0 ){
258957	rc = SQLITE_NOMEM;
258958	}
258959	}
258960	if( rc==SQLITE_OK ){
258961	pText = (const char*)sqlite3_value_text(pVal);
258962	nText = sqlite3_value_bytes(pVal);
258963	if( pConfig->bLocale && pSeek ){
258964	pLoc = (const char*)sqlite3_column_text(pSeek, iCol+pConfig->nCol);
258965	nLoc = sqlite3_column_bytes(pSeek, iCol + pConfig->nCol);
258966	}
258967	}
258968	}
258969
258970	if( rc==SQLITE_OK ){
258971	sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
	@@ -258064,10 +258977,11 @@
258977	if( rc==SQLITE_OK && p->aTotalSize[iCol-1]<0 ){
258978	rc = FTS5_CORRUPT;
258979	}
258980	sqlite3Fts5ClearLocale(pConfig);
258981	}
258982	sqlite3_value_free(pFree);
258983	}
258984	}
258985	if( rc==SQLITE_OK && p->nTotalRow<1 ){
258986	rc = FTS5_CORRUPT;
258987	}else{
258988

M extsrc/sqlite3.h

+199 -153

		--- extsrc/sqlite3.h
		+++ extsrc/sqlite3.h
		@@ -144,13 +144,13 @@
144	144	**
145	145	** See also: [sqlite3_libversion()],
146	146	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147	147	** [sqlite_version()] and [sqlite_source_id()].
148	148	*/
149		-#define SQLITE_VERSION "3.50.0"
150		-#define SQLITE_VERSION_NUMBER 3050000
151		-#define SQLITE_SOURCE_ID "2025-04-15 21:59:38 d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5"
	149	+#define SQLITE_VERSION "3.51.0"
	150	+#define SQLITE_VERSION_NUMBER 3051000
	151	+#define SQLITE_SOURCE_ID "2025-07-15 19:00:01 9f184f8dfa5ef6d57e10376adc30e0060ceda07d283c23dfdfe3dbdd6608f839"
152	152
153	153	/*
154	154	** CAPI3REF: Run-Time Library Version Numbers
155	155	** KEYWORDS: sqlite3_version sqlite3_sourceid
156	156	**
		@@ -166,13 +166,13 @@
166	166	** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
167	167	** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
168	168	** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
169	169	** </pre></blockquote>)^
170	170	**
171		-** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
172		-** macro. ^The sqlite3_libversion() function returns a pointer to the
173		-** to the sqlite3_version[] string constant. The sqlite3_libversion()
	171	+** ^The sqlite3_version[] string constant contains the text of the
	172	+** [SQLITE_VERSION] macro. ^The sqlite3_libversion() function returns a
	173	+** pointer to the sqlite3_version[] string constant. The sqlite3_libversion()
174	174	** function is provided for use in DLLs since DLL users usually do not have
175	175	** direct access to string constants within the DLL. ^The
176	176	** sqlite3_libversion_number() function returns an integer equal to
177	177	** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
178	178	** a pointer to a string constant whose value is the same as the
		@@ -368,11 +368,11 @@
368	368	** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
369	369	** that allows an application to run multiple statements of SQL
370	370	** without having to use a lot of C code.
371	371	**
372	372	** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
373		-** semicolon-separate SQL statements passed into its 2nd argument,
	373	+** semicolon-separated SQL statements passed into its 2nd argument,
374	374	** in the context of the [database connection] passed in as its 1st
375	375	** argument. ^If the callback function of the 3rd argument to
376	376	** sqlite3_exec() is not NULL, then it is invoked for each result row
377	377	** coming out of the evaluated SQL statements. ^The 4th argument to
378	378	** sqlite3_exec() is relayed through to the 1st argument of each
		@@ -401,11 +401,11 @@
401	401	** callback is an array of pointers to strings obtained as if from
402	402	** [sqlite3_column_text()], one for each column. ^If an element of a
403	403	** result row is NULL then the corresponding string pointer for the
404	404	** sqlite3_exec() callback is a NULL pointer. ^The 4th argument to the
405	405	** sqlite3_exec() callback is an array of pointers to strings where each
406		-** entry represents the name of corresponding result column as obtained
	406	+** entry represents the name of a corresponding result column as obtained
407	407	** from [sqlite3_column_name()].
408	408	**
409	409	** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
410	410	** to an empty string, or a pointer that contains only whitespace and/or
411	411	** SQL comments, then no SQL statements are evaluated and the database
		@@ -587,11 +587,11 @@
587	587	** Applications should not depend on the historical behavior.
588	588	**
589	589	** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
590	590	** [sqlite3_open_v2()] does not cause the underlying database file
591	591	** to be opened using O_EXCL. Passing SQLITE_OPEN_EXCLUSIVE into
592		-** [sqlite3_open_v2()] has historically be a no-op and might become an
	592	+** [sqlite3_open_v2()] has historically been a no-op and might become an
593	593	** error in future versions of SQLite.
594	594	*/
595	595	#define SQLITE_OPEN_READONLY 0x00000001 /* Ok for sqlite3_open_v2() */
596	596	#define SQLITE_OPEN_READWRITE 0x00000002 /* Ok for sqlite3_open_v2() */
597	597	#define SQLITE_OPEN_CREATE 0x00000004 /* Ok for sqlite3_open_v2() */
		@@ -681,11 +681,11 @@
681	681	** CAPI3REF: File Locking Levels
682	682	**
683	683	** SQLite uses one of these integer values as the second
684	684	** argument to calls it makes to the xLock() and xUnlock() methods
685	685	** of an [sqlite3_io_methods] object. These values are ordered from
686		-** lest restrictive to most restrictive.
	686	+** least restrictive to most restrictive.
687	687	**
688	688	** The argument to xLock() is always SHARED or higher. The argument to
689	689	** xUnlock is either SHARED or NONE.
690	690	*/
691	691	#define SQLITE_LOCK_NONE 0 /* xUnlock() only */
		@@ -997,11 +997,11 @@
997	997	** reason, the entire database file will be overwritten by the current
998	998	** transaction. This is used by VACUUM operations.
999	999	**
1000	1000	** <li>[[SQLITE_FCNTL_VFSNAME]]
1001	1001	** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
1002		-** all [VFSes] in the VFS stack. The names are of all VFS shims and the
	1002	+** all [VFSes] in the VFS stack. The names of all VFS shims and the
1003	1003	** final bottom-level VFS are written into memory obtained from
1004	1004	** [sqlite3_malloc()] and the result is stored in the char* variable
1005	1005	** that the fourth parameter of [sqlite3_file_control()] points to.
1006	1006	** The caller is responsible for freeing the memory when done. As with
1007	1007	** all file-control actions, there is no guarantee that this will actually
		@@ -1011,11 +1011,11 @@
1011	1011	**
1012	1012	** <li>[[SQLITE_FCNTL_VFS_POINTER]]
1013	1013	** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
1014	1014	** [VFSes] currently in use. ^(The argument X in
1015	1015	** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
1016		- of type "[sqlite3_vfs] ". This opcodes will set *X
	1016	+ of type "[sqlite3_vfs] ". This opcode will set *X
1017	1017	** to a pointer to the top-level VFS.)^
1018	1018	** ^When there are multiple VFS shims in the stack, this opcode finds the
1019	1019	** upper-most shim only.
1020	1020	**
1021	1021	** <li>[[SQLITE_FCNTL_PRAGMA]]
		@@ -1201,11 +1201,11 @@
1201	1201	** record the fact that the pages have been checkpointed.
1202	1202	**
1203	1203	** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
1204	1204	** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
1205	1205	** whether or not there is a database client in another process with a wal-mode
1206		-** transaction open on the database or not. It is only available on unix.The
	1206	+** transaction open on the database or not. It is only available on unix. The
1207	1207	** (void*) argument passed with this file-control should be a pointer to a
1208	1208	** value of type (int). The integer value is set to 1 if the database is a wal
1209	1209	** mode database and there exists at least one client in another process that
1210	1210	** currently has an SQL transaction open on the database. It is set to 0 if
1211	1211	** the database is not a wal-mode db, or if there is no such connection in any
		@@ -1626,11 +1626,11 @@
1626	1626	**
1627	1627	** ^The sqlite3_initialize() routine is called internally by many other
1628	1628	** SQLite interfaces so that an application usually does not need to
1629	1629	** invoke sqlite3_initialize() directly. For example, [sqlite3_open()]
1630	1630	** calls sqlite3_initialize() so the SQLite library will be automatically
1631		-** initialized when [sqlite3_open()] is called if it has not be initialized
	1631	+** initialized when [sqlite3_open()] is called if it has not been initialized
1632	1632	** already. ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
1633	1633	** compile-time option, then the automatic calls to sqlite3_initialize()
1634	1634	** are omitted and the application must call sqlite3_initialize() directly
1635	1635	** prior to using any other SQLite interface. For maximum portability,
1636	1636	** it is recommended that applications always invoke sqlite3_initialize()
		@@ -1883,25 +1883,25 @@
1883	1883	** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
1884	1884	** is a pointer to an instance of the [sqlite3_mem_methods] structure.
1885	1885	** The [sqlite3_mem_methods]
1886	1886	** structure is filled with the currently defined memory allocation routines.)^
1887	1887	** This option can be used to overload the default memory allocation
1888		-** routines with a wrapper that simulations memory allocation failure or
	1888	+** routines with a wrapper that simulates memory allocation failure or
1889	1889	** tracks memory usage, for example. </dd>
1890	1890	**
1891	1891	** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
1892		-** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
	1892	+** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes a single argument of
1893	1893	** type int, interpreted as a boolean, which if true provides a hint to
1894	1894	** SQLite that it should avoid large memory allocations if possible.
1895	1895	** SQLite will run faster if it is free to make large memory allocations,
1896		-** but some application might prefer to run slower in exchange for
	1896	+** but some applications might prefer to run slower in exchange for
1897	1897	** guarantees about memory fragmentation that are possible if large
1898	1898	** allocations are avoided. This hint is normally off.
1899	1899	** </dd>
1900	1900	**
1901	1901	** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
1902		-** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
	1902	+** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes a single argument of type int,
1903	1903	** interpreted as a boolean, which enables or disables the collection of
1904	1904	** memory allocation statistics. ^(When memory allocation statistics are
1905	1905	** disabled, the following SQLite interfaces become non-operational:
1906	1906	** <ul>
1907	1907	** <li> [sqlite3_hard_heap_limit64()]
		@@ -1942,11 +1942,11 @@
1942	1942	** a page cache line is larger than sz bytes or if all of the pMem buffer
1943	1943	** is exhausted.
1944	1944	** ^If pMem is NULL and N is non-zero, then each database connection
1945	1945	** does an initial bulk allocation for page cache memory
1946	1946	** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
1947		-** of -1024*N bytes if N is negative, . ^If additional
	1947	+** of -1024*N bytes if N is negative. ^If additional
1948	1948	** page cache memory is needed beyond what is provided by the initial
1949	1949	** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
1950	1950	** additional cache line. </dd>
1951	1951	**
1952	1952	** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
		@@ -1971,11 +1971,11 @@
1971	1971	**
1972	1972	** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
1973	1973	** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
1974	1974	** pointer to an instance of the [sqlite3_mutex_methods] structure.
1975	1975	** The argument specifies alternative low-level mutex routines to be used
1976		-** in place the mutex routines built into SQLite.)^ ^SQLite makes a copy of
	1976	+** in place of the mutex routines built into SQLite.)^ ^SQLite makes a copy of
1977	1977	** the content of the [sqlite3_mutex_methods] structure before the call to
1978	1978	** [sqlite3_config()] returns. ^If SQLite is compiled with
1979	1979	** the [SQLITE_THREADSAFE \| SQLITE_THREADSAFE=0] compile-time option then
1980	1980	** the entire mutexing subsystem is omitted from the build and hence calls to
1981	1981	** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
		@@ -2013,11 +2013,11 @@
2013	2013	** the interface to a custom page cache implementation.)^
2014	2014	** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
2015	2015	**
2016	2016	** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
2017	2017	** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
2018		-** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies of
	2018	+** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies off
2019	2019	** the current page cache implementation into that object.)^ </dd>
2020	2020	**
2021	2021	** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
2022	2022	** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
2023	2023	** global [error log].
		@@ -2030,11 +2030,11 @@
2030	2030	** passed through as the first parameter to the application-defined logger
2031	2031	** function whenever that function is invoked. ^The second parameter to
2032	2032	** the logger function is a copy of the first parameter to the corresponding
2033	2033	** [sqlite3_log()] call and is intended to be a [result code] or an
2034	2034	** [extended result code]. ^The third parameter passed to the logger is
2035		-** log message after formatting via [sqlite3_snprintf()].
	2035	+** a log message after formatting via [sqlite3_snprintf()].
2036	2036	** The SQLite logging interface is not reentrant; the logger function
2037	2037	** supplied by the application must not invoke any SQLite interface.
2038	2038	** In a multi-threaded application, the application-defined logger
2039	2039	** function must be threadsafe. </dd>
2040	2040	**
		@@ -2221,11 +2221,11 @@
2221	2221	** CAPI3REF: Database Connection Configuration Options
2222	2222	**
2223	2223	** These constants are the available integer configuration options that
2224	2224	** can be passed as the second parameter to the [sqlite3_db_config()] interface.
2225	2225	**
2226		-** The [sqlite3_db_config()] interface is a var-args functions. It takes a
	2226	+** The [sqlite3_db_config()] interface is a var-args function. It takes a
2227	2227	** variable number of parameters, though always at least two. The number of
2228	2228	** parameters passed into sqlite3_db_config() depends on which of these
2229	2229	** constants is given as the second parameter. This documentation page
2230	2230	** refers to parameters beyond the second as "arguments". Thus, when this
2231	2231	** page says "the N-th argument" it means "the N-th parameter past the
		@@ -2355,12 +2355,12 @@
2355	2355	** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
2356	2356	** There must be two additional arguments.
2357	2357	** When the first argument to this interface is 1, then only the C-API is
2358	2358	** enabled and the SQL function remains disabled. If the first argument to
2359	2359	** this interface is 0, then both the C-API and the SQL function are disabled.
2360		-** If the first argument is -1, then no changes are made to state of either the
2361		-** C-API or the SQL function.
	2360	+** If the first argument is -1, then no changes are made to the state of either
	2361	+** the C-API or the SQL function.
2362	2362	** The second parameter is a pointer to an integer into which
2363	2363	** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
2364	2364	** is disabled or enabled following this call. The second parameter may
2365	2365	** be a NULL pointer, in which case the new setting is not reported back.
2366	2366	** </dd>
		@@ -2474,11 +2474,11 @@
2474	2474	** </dd>
2475	2475	**
2476	2476	** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
2477	2477	** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
2478	2478	** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
2479		-** the legacy behavior of the [ALTER TABLE RENAME] command such it
	2479	+** the legacy behavior of the [ALTER TABLE RENAME] command such that it
2480	2480	** behaves as it did prior to [version 3.24.0] (2018-06-04). See the
2481	2481	** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
2482	2482	** additional information. This feature can also be turned on and off
2483	2483	** using the [PRAGMA legacy_alter_table] statement.
2484	2484	** </dd>
		@@ -2523,11 +2523,11 @@
2523	2523	**
2524	2524	** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
2525	2525	** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
2526	2526	** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
2527	2527	** the legacy file format flag. When activated, this flag causes all newly
2528		-** created database file to have a schema format version number (the 4-byte
	2528	+** created database files to have a schema format version number (the 4-byte
2529	2529	** integer found at offset 44 into the database header) of 1. This in turn
2530	2530	** means that the resulting database file will be readable and writable by
2531	2531	** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
2532	2532	** newly created databases are generally not understandable by SQLite versions
2533	2533	** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
		@@ -2550,11 +2550,11 @@
2550	2550	** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2551	2551	** statistics. For statistics to be collected, the flag must be set on
2552	2552	** the database handle both when the SQL statement is prepared and when it
2553	2553	** is stepped. The flag is set (collection of statistics is enabled)
2554	2554	** by default. <p>This option takes two arguments: an integer and a pointer to
2555		-** an integer.. The first argument is 1, 0, or -1 to enable, disable, or
	2555	+** an integer. The first argument is 1, 0, or -1 to enable, disable, or
2556	2556	** leave unchanged the statement scanstatus option. If the second argument
2557	2557	** is not NULL, then the value of the statement scanstatus setting after
2558	2558	** processing the first argument is written into the integer that the second
2559	2559	** argument points to.
2560	2560	** </dd>
		@@ -2593,12 +2593,12 @@
2593	2593	** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
2594	2594	** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
2595	2595	** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
2596	2596	** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
2597	2597	** This capability is enabled by default. Applications can disable or
2598		-** reenable this capability using the current DBCONFIG option. If the
2599		-** the this capability is disabled, the [ATTACH] command will still work,
	2598	+** reenable this capability using the current DBCONFIG option. If
	2599	+** this capability is disabled, the [ATTACH] command will still work,
2600	2600	** but the database will be opened read-only. If this option is disabled,
2601	2601	** then the ability to create a new database using [ATTACH] is also disabled,
2602	2602	** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
2603	2603	** option.<p>
2604	2604	** This option takes two arguments which are an integer and a pointer
		@@ -2628,11 +2628,11 @@
2628	2628	**
2629	2629	** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
2630	2630	**
2631	2631	** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
2632	2632	** overall call to [sqlite3_db_config()] has a total of four parameters.
2633		-** The first argument (the third parameter to sqlite3_db_config()) is a integer.
	2633	+** The first argument (the third parameter to sqlite3_db_config()) is an integer.
2634	2634	** The second argument is a pointer to an integer. If the first argument is 1,
2635	2635	** then the option becomes enabled. If the first integer argument is 0, then the
2636	2636	** option is disabled. If the first argument is -1, then the option setting
2637	2637	** is unchanged. The second argument, the pointer to an integer, may be NULL.
2638	2638	** If the second argument is not NULL, then a value of 0 or 1 is written into
		@@ -2918,11 +2918,11 @@
2918	2918	** and comments that follow the final semicolon are ignored.
2919	2919	**
2920	2920	** ^These routines return 0 if the statement is incomplete. ^If a
2921	2921	** memory allocation fails, then SQLITE_NOMEM is returned.
2922	2922	**
2923		-** ^These routines do not parse the SQL statements thus
	2923	+** ^These routines do not parse the SQL statements and thus
2924	2924	** will not detect syntactically incorrect SQL.
2925	2925	**
2926	2926	** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
2927	2927	** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
2928	2928	** automatically by sqlite3_complete16(). If that initialization fails,
		@@ -3035,11 +3035,11 @@
3035	3035	** Passing 0 to this function disables blocking locks altogether. Passing
3036	3036	** -1 to this function requests that the VFS blocks for a long time -
3037	3037	** indefinitely if possible. The results of passing any other negative value
3038	3038	** are undefined.
3039	3039	**
3040		-** Internally, each SQLite database handle store two timeout values - the
	3040	+** Internally, each SQLite database handle stores two timeout values - the
3041	3041	** busy-timeout (used for rollback mode databases, or if the VFS does not
3042	3042	** support blocking locks) and the setlk-timeout (used for blocking locks
3043	3043	** on wal-mode databases). The sqlite3_busy_timeout() method sets both
3044	3044	** values, this function sets only the setlk-timeout value. Therefore,
3045	3045	** to configure separate busy-timeout and setlk-timeout values for a single
		@@ -3065,11 +3065,11 @@
3065	3065	** METHOD: sqlite3
3066	3066	**
3067	3067	** This is a legacy interface that is preserved for backwards compatibility.
3068	3068	** Use of this interface is not recommended.
3069	3069	**
3070		-** Definition: A <b>result table</b> is memory data structure created by the
	3070	+** Definition: A <b>result table</b> is a memory data structure created by the
3071	3071	** [sqlite3_get_table()] interface. A result table records the
3072	3072	** complete query results from one or more queries.
3073	3073	**
3074	3074	** The table conceptually has a number of rows and columns. But
3075	3075	** these numbers are not part of the result table itself. These
		@@ -3208,11 +3208,11 @@
3208	3208	** of a signed 32-bit integer.
3209	3209	**
3210	3210	** ^Calling sqlite3_free() with a pointer previously returned
3211	3211	** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
3212	3212	** that it might be reused. ^The sqlite3_free() routine is
3213		-** a no-op if is called with a NULL pointer. Passing a NULL pointer
	3213	+** a no-op if it is called with a NULL pointer. Passing a NULL pointer
3214	3214	** to sqlite3_free() is harmless. After being freed, memory
3215	3215	** should neither be read nor written. Even reading previously freed
3216	3216	** memory might result in a segmentation fault or other severe error.
3217	3217	** Memory corruption, a segmentation fault, or other severe error
3218	3218	** might result if sqlite3_free() is called with a non-NULL pointer that
		@@ -3226,17 +3226,17 @@
3226	3226	** ^If the N parameter to sqlite3_realloc(X,N) is zero or
3227	3227	** negative then the behavior is exactly the same as calling
3228	3228	** sqlite3_free(X).
3229	3229	** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
3230	3230	** of at least N bytes in size or NULL if insufficient memory is available.
3231		-** ^If M is the size of the prior allocation, then min(N,M) bytes
3232		-** of the prior allocation are copied into the beginning of buffer returned
	3231	+** ^If M is the size of the prior allocation, then min(N,M) bytes of the
	3232	+** prior allocation are copied into the beginning of the buffer returned
3233	3233	** by sqlite3_realloc(X,N) and the prior allocation is freed.
3234	3234	** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
3235	3235	** prior allocation is not freed.
3236	3236	**
3237		-** ^The sqlite3_realloc64(X,N) interfaces works the same as
	3237	+** ^The sqlite3_realloc64(X,N) interface works the same as
3238	3238	** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
3239	3239	** of a 32-bit signed integer.
3240	3240	**
3241	3241	** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
3242	3242	** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
		@@ -3282,11 +3282,11 @@
3282	3282	** ^The [sqlite3_memory_highwater()] routine returns the maximum
3283	3283	** value of [sqlite3_memory_used()] since the high-water mark
3284	3284	** was last reset. ^The values returned by [sqlite3_memory_used()] and
3285	3285	** [sqlite3_memory_highwater()] include any overhead
3286	3286	** added by SQLite in its implementation of [sqlite3_malloc()],
3287		-** but not overhead added by the any underlying system library
	3287	+** but not overhead added by any underlying system library
3288	3288	** routines that [sqlite3_malloc()] may call.
3289	3289	**
3290	3290	** ^The memory high-water mark is reset to the current value of
3291	3291	** [sqlite3_memory_used()] if and only if the parameter to
3292	3292	** [sqlite3_memory_highwater()] is true. ^The value returned
		@@ -3734,19 +3734,19 @@
3734	3734	** attempt to use the same database connection at the same time.
3735	3735	** (Mutexes will block any actual concurrency, but in this mode
3736	3736	** there is no harm in trying.)
3737	3737	**
3738	3738	** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
3739		-** <dd>The database is opened [shared cache] enabled, overriding
	3739	+** <dd>The database is opened with [shared cache] enabled, overriding
3740	3740	** the default shared cache setting provided by
3741	3741	** [sqlite3_enable_shared_cache()].)^
3742	3742	** The [use of shared cache mode is discouraged] and hence shared cache
3743	3743	** capabilities may be omitted from many builds of SQLite. In such cases,
3744	3744	** this option is a no-op.
3745	3745	**
3746	3746	** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
3747		-** <dd>The database is opened [shared cache] disabled, overriding
	3747	+** <dd>The database is opened with [shared cache] disabled, overriding
3748	3748	** the default shared cache setting provided by
3749	3749	** [sqlite3_enable_shared_cache()].)^
3750	3750	**
3751	3751	** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
3752	3752	** <dd>The database connection comes up in "extended result code mode".
		@@ -4077,11 +4077,11 @@
4077	4077	** These interfaces are provided for use by [VFS shim] implementations and
4078	4078	** are not useful outside of that context.
4079	4079	**
4080	4080	** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
4081	4081	** database filename D with corresponding journal file J and WAL file W and
4082		-** with N URI parameters key/values pairs in the array P. The result from
	4082	+** an array P of N URI Key/Value pairs. The result from
4083	4083	** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
4084	4084	** is safe to pass to routines like:
4085	4085	** <ul>
4086	4086	** <li> [sqlite3_uri_parameter()],
4087	4087	** <li> [sqlite3_uri_boolean()],
		@@ -4160,19 +4160,19 @@
4160	4160	** The application does not need to worry about freeing the result.
4161	4161	** However, the error string might be overwritten or deallocated by
4162	4162	** subsequent calls to other SQLite interface functions.)^
4163	4163	**
4164	4164	** ^The sqlite3_errstr(E) interface returns the English-language text
4165		-** that describes the [result code] E, as UTF-8, or NULL if E is not an
	4165	+** that describes the [result code] E, as UTF-8, or NULL if E is not a
4166	4166	** result code for which a text error message is available.
4167	4167	** ^(Memory to hold the error message string is managed internally
4168	4168	** and must not be freed by the application)^.
4169	4169	**
4170	4170	** ^If the most recent error references a specific token in the input
4171	4171	** SQL, the sqlite3_error_offset() interface returns the byte offset
4172	4172	** of the start of that token. ^The byte offset returned by
4173		-** sqlite3_error_offset() assumes that the input SQL is UTF8.
	4173	+** sqlite3_error_offset() assumes that the input SQL is UTF-8.
4174	4174	** ^If the most recent error does not reference a specific token in the input
4175	4175	** SQL, then the sqlite3_error_offset() function returns -1.
4176	4176	**
4177	4177	** When the serialized [threading mode] is in use, it might be the
4178	4178	** case that a second error occurs on a separate thread in between
		@@ -4267,12 +4267,12 @@
4267	4267	** CAPI3REF: Run-Time Limit Categories
4268	4268	** KEYWORDS: {limit category} {*limit categories}
4269	4269	**
4270	4270	** These constants define various performance limits
4271	4271	** that can be lowered at run-time using [sqlite3_limit()].
4272		-** The synopsis of the meanings of the various limits is shown below.
4273		-** Additional information is available at [limits \| Limits in SQLite].
	4272	+** A concise description of these limits follows, and additional information
	4273	+** is available at [limits \| Limits in SQLite].
4274	4274	**
4275	4275	** <dl>
4276	4276	** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
4277	4277	** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
4278	4278	**
		@@ -4333,11 +4333,11 @@
4333	4333	#define SQLITE_LIMIT_WORKER_THREADS 11
4334	4334
4335	4335	/*
4336	4336	** CAPI3REF: Prepare Flags
4337	4337	**
4338		-** These constants define various flags that can be passed into
	4338	+** These constants define various flags that can be passed into the
4339	4339	** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
4340	4340	** [sqlite3_prepare16_v3()] interfaces.
4341	4341	**
4342	4342	** New flags may be added in future releases of SQLite.
4343	4343	**
		@@ -4420,11 +4420,11 @@
4420	4420	** statement is generated.
4421	4421	** If the caller knows that the supplied string is nul-terminated, then
4422	4422	** there is a small performance advantage to passing an nByte parameter that
4423	4423	** is the number of bytes in the input string <i>including</i>
4424	4424	** the nul-terminator.
4425		-** Note that nByte measure the length of the input in bytes, not
	4425	+** Note that nByte measures the length of the input in bytes, not
4426	4426	** characters, even for the UTF-16 interfaces.
4427	4427	**
4428	4428	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
4429	4429	** past the end of the first SQL statement in zSql. These routines only
4430	4430	** compile the first statement in zSql, so *pzTail is left pointing to
		@@ -4554,11 +4554,11 @@
4554	4554	** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
4555	4555	** will return "SELECT 2345,NULL".)^
4556	4556	**
4557	4557	** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
4558	4558	** is available to hold the result, or if the result would exceed the
4559		-** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
	4559	+** maximum string length determined by the [SQLITE_LIMIT_LENGTH].
4560	4560	**
4561	4561	** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
4562	4562	** bound parameter expansions. ^The [SQLITE_OMIT_TRACE] compile-time
4563	4563	** option causes sqlite3_expanded_sql() to always return NULL.
4564	4564	**
		@@ -4742,11 +4742,11 @@
4742	4742	/*
4743	4743	** CAPI3REF: SQL Function Context Object
4744	4744	**
4745	4745	** The context in which an SQL function executes is stored in an
4746	4746	** sqlite3_context object. ^A pointer to an sqlite3_context object
4747		-** is always first parameter to [application-defined SQL functions].
	4747	+** is always the first parameter to [application-defined SQL functions].
4748	4748	** The application-defined SQL function implementation will pass this
4749	4749	** pointer through into calls to [sqlite3_result_int \| sqlite3_result()],
4750	4750	** [sqlite3_aggregate_context()], [sqlite3_user_data()],
4751	4751	** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
4752	4752	** and/or [sqlite3_set_auxdata()].
		@@ -4758,11 +4758,11 @@
4758	4758	** KEYWORDS: {host parameter} {host parameters} {host parameter name}
4759	4759	** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
4760	4760	** METHOD: sqlite3_stmt
4761	4761	**
4762	4762	** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
4763		-** literals may be replaced by a [parameter] that matches one of following
	4763	+** literals may be replaced by a [parameter] that matches one of the following
4764	4764	** templates:
4765	4765	**
4766	4766	** <ul>
4767	4767	** <li> ?
4768	4768	** <li> ?NNN
		@@ -4803,11 +4803,11 @@
4803	4803	** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
4804	4804	** otherwise.
4805	4805	**
4806	4806	** [[byte-order determination rules]] ^The byte-order of
4807	4807	** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
4808		-** found in first character, which is removed, or in the absence of a BOM
	4808	+** found in the first character, which is removed, or in the absence of a BOM
4809	4809	** the byte order is the native byte order of the host
4810	4810	** machine for sqlite3_bind_text16() or the byte order specified in
4811	4811	** the 6th parameter for sqlite3_bind_text64().)^
4812	4812	** ^If UTF16 input text contains invalid unicode
4813	4813	** characters, then SQLite might change those invalid characters
		@@ -4823,11 +4823,11 @@
4823	4823	** the behavior is undefined.
4824	4824	** If a non-negative fourth parameter is provided to sqlite3_bind_text()
4825	4825	** or sqlite3_bind_text16() or sqlite3_bind_text64() then
4826	4826	** that parameter must be the byte offset
4827	4827	** where the NUL terminator would occur assuming the string were NUL
4828		-** terminated. If any NUL characters occurs at byte offsets less than
	4828	+** terminated. If any NUL characters occur at byte offsets less than
4829	4829	** the value of the fourth parameter then the resulting string value will
4830	4830	** contain embedded NULs. The result of expressions involving strings
4831	4831	** with embedded NULs is undefined.
4832	4832	**
4833	4833	** ^The fifth argument to the BLOB and string binding interfaces controls
		@@ -5035,11 +5035,11 @@
5035	5035	/*
5036	5036	** CAPI3REF: Source Of Data In A Query Result
5037	5037	** METHOD: sqlite3_stmt
5038	5038	**
5039	5039	** ^These routines provide a means to determine the database, table, and
5040		-** table column that is the origin of a particular result column in
	5040	+** table column that is the origin of a particular result column in a
5041	5041	** [SELECT] statement.
5042	5042	** ^The name of the database or table or column can be returned as
5043	5043	** either a UTF-8 or UTF-16 string. ^The _database_ routines return
5044	5044	** the database name, the _table_ routines return the table name, and
5045	5045	** the origin_ routines return the column name.
		@@ -5479,11 +5479,11 @@
5479	5479	** CAPI3REF: Destroy A Prepared Statement Object
5480	5480	** DESTRUCTOR: sqlite3_stmt
5481	5481	**
5482	5482	** ^The sqlite3_finalize() function is called to delete a [prepared statement].
5483	5483	** ^If the most recent evaluation of the statement encountered no errors
5484		-** or if the statement is never been evaluated, then sqlite3_finalize() returns
	5484	+** or if the statement has never been evaluated, then sqlite3_finalize() returns
5485	5485	** SQLITE_OK. ^If the most recent evaluation of statement S failed, then
5486	5486	** sqlite3_finalize(S) returns the appropriate [error code] or
5487	5487	** [extended error code].
5488	5488	**
5489	5489	** ^The sqlite3_finalize(S) routine can be called at any point during
		@@ -5604,12 +5604,12 @@
5604	5604	** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
5605	5605	** index expressions, or the WHERE clause of partial indexes.
5606	5606	**
5607	5607	** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
5608	5608	** all application-defined SQL functions that do not need to be
5609		-** used inside of triggers, view, CHECK constraints, or other elements of
5610		-** the database schema. This flags is especially recommended for SQL
	5609	+** used inside of triggers, views, CHECK constraints, or other elements of
	5610	+** the database schema. This flag is especially recommended for SQL
5611	5611	** functions that have side effects or reveal internal application state.
5612	5612	** Without this flag, an attacker might be able to modify the schema of
5613	5613	** a database file to include invocations of the function with parameters
5614	5614	** chosen by the attacker, which the application will then execute when
5615	5615	** the database file is opened and read.
		@@ -5636,11 +5636,11 @@
5636	5636	** or aggregate window function. More details regarding the implementation
5637	5637	** of aggregate window functions are
5638	5638	** [user-defined window functions\|available here].
5639	5639	**
5640	5640	** ^(If the final parameter to sqlite3_create_function_v2() or
5641		-** sqlite3_create_window_function() is not NULL, then it is destructor for
	5641	+** sqlite3_create_window_function() is not NULL, then it is the destructor for
5642	5642	** the application data pointer. The destructor is invoked when the function
5643	5643	** is deleted, either by being overloaded or when the database connection
5644	5644	** closes.)^ ^The destructor is also invoked if the call to
5645	5645	** sqlite3_create_function_v2() fails. ^When the destructor callback is
5646	5646	** invoked, it is passed a single argument which is a copy of the application
		@@ -5711,11 +5711,11 @@
5711	5711	);
5712	5712
5713	5713	/*
5714	5714	** CAPI3REF: Text Encodings
5715	5715	**
5716		-** These constant define integer codes that represent the various
	5716	+** These constants define integer codes that represent the various
5717	5717	** text encodings supported by SQLite.
5718	5718	*/
5719	5719	#define SQLITE_UTF8 1 /* IMP: R-37514-35566 */
5720	5720	#define SQLITE_UTF16LE 2 /* IMP: R-03371-37637 */
5721	5721	#define SQLITE_UTF16BE 3 /* IMP: R-51971-34154 */
		@@ -5803,11 +5803,11 @@
5803	5803	** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
5804	5804	** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
5805	5805	** result.
5806	5806	** Every function that invokes [sqlite3_result_subtype()] should have this
5807	5807	** property. If it does not, then the call to [sqlite3_result_subtype()]
5808		-** might become a no-op if the function is used as term in an
	5808	+** might become a no-op if the function is used as a term in an
5809	5809	** [expression index]. On the other hand, SQL functions that never invoke
5810	5810	** [sqlite3_result_subtype()] should avoid setting this property, as the
5811	5811	** purpose of this property is to disable certain optimizations that are
5812	5812	** incompatible with subtypes.
5813	5813	**
		@@ -5930,11 +5930,11 @@
5930	5930	**
5931	5931	** ^Within the [xUpdate] method of a [virtual table], the
5932	5932	** sqlite3_value_nochange(X) interface returns true if and only if
5933	5933	** the column corresponding to X is unchanged by the UPDATE operation
5934	5934	** that the xUpdate method call was invoked to implement and if
5935		-** and the prior [xColumn] method call that was invoked to extracted
	5935	+** the prior [xColumn] method call that was invoked to extract
5936	5936	** the value for that column returned without setting a result (probably
5937	5937	** because it queried [sqlite3_vtab_nochange()] and found that the column
5938	5938	** was unchanging). ^Within an [xUpdate] method, any value for which
5939	5939	** sqlite3_value_nochange(X) is true will in all other respects appear
5940	5940	** to be a NULL value. If sqlite3_value_nochange(X) is invoked anywhere other
		@@ -6036,11 +6036,11 @@
6036	6036	/*
6037	6037	** CAPI3REF: Copy And Free SQL Values
6038	6038	** METHOD: sqlite3_value
6039	6039	**
6040	6040	** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
6041		-** object D and returns a pointer to that copy. ^The [sqlite3_value] returned
	6041	+** object V and returns a pointer to that copy. ^The [sqlite3_value] returned
6042	6042	** is a [protected sqlite3_value] object even if the input is not.
6043	6043	** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
6044	6044	** memory allocation fails. ^If V is a [pointer value], then the result
6045	6045	** of sqlite3_value_dup(V) is a NULL value.
6046	6046	**
		@@ -6074,11 +6074,11 @@
6074	6074	** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
6075	6075	** when first called if N is less than or equal to zero or if a memory
6076	6076	** allocation error occurs.
6077	6077	**
6078	6078	** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
6079		-** determined by the N parameter on first successful call. Changing the
	6079	+** determined by the N parameter on the first successful call. Changing the
6080	6080	** value of N in any subsequent call to sqlite3_aggregate_context() within
6081	6081	** the same aggregate function instance will not resize the memory
6082	6082	** allocation.)^ Within the xFinal callback, it is customary to set
6083	6083	** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
6084	6084	** pointless memory allocations occur.
		@@ -6236,11 +6236,11 @@
6236	6236	** of as a secret key such that only code that knows the secret key is able
6237	6237	** to access the associated data.
6238	6238	**
6239	6239	** Security Warning: These interfaces should not be exposed in scripting
6240	6240	** languages or in other circumstances where it might be possible for an
6241		-** an attacker to invoke them. Any agent that can invoke these interfaces
	6241	+** attacker to invoke them. Any agent that can invoke these interfaces
6242	6242	** can probably also take control of the process.
6243	6243	**
6244	6244	** Database connection client data is only available for SQLite
6245	6245	** version 3.44.0 ([dateof:3.44.0]) and later.
6246	6246	**
		@@ -6350,11 +6350,11 @@
6350	6350	** ^If the 3rd parameter to the sqlite3_result_text* interfaces
6351	6351	** is non-negative, then as many bytes (not characters) of the text
6352	6352	** pointed to by the 2nd parameter are taken as the application-defined
6353	6353	** function result. If the 3rd parameter is non-negative, then it
6354	6354	** must be the byte offset into the string where the NUL terminator would
6355		-** appear if the string where NUL terminated. If any NUL characters occur
	6355	+** appear if the string were NUL terminated. If any NUL characters occur
6356	6356	** in the string at a byte offset that is less than the value of the 3rd
6357	6357	** parameter, then the resulting string will contain embedded NULs and the
6358	6358	** result of expressions operating on strings with embedded NULs is undefined.
6359	6359	** ^If the 4th parameter to the sqlite3_result_text* interfaces
6360	6360	** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
		@@ -6408,11 +6408,11 @@
6408	6408	** for the P parameter. ^SQLite invokes D with P as its only argument
6409	6409	** when SQLite is finished with P. The T parameter should be a static
6410	6410	** string and preferably a string literal. The sqlite3_result_pointer()
6411	6411	** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
6412	6412	**
6413		-** If these routines are called from within the different thread
	6413	+** If these routines are called from within a different thread
6414	6414	** than the one containing the application-defined function that received
6415	6415	** the [sqlite3_context] pointer, the results are undefined.
6416	6416	*/
6417	6417	SQLITE_API void sqlite3_result_blob(sqlite3_context, const void, int, void()(void));
6418	6418	SQLITE_API void sqlite3_result_blob64(sqlite3_context,const void,
		@@ -6814,11 +6814,11 @@
6814	6814	/*
6815	6815	** CAPI3REF: Return The Schema Name For A Database Connection
6816	6816	** METHOD: sqlite3
6817	6817	**
6818	6818	** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
6819		-** for the N-th database on database connection D, or a NULL pointer of N is
	6819	+** for the N-th database on database connection D, or a NULL pointer if N is
6820	6820	** out of range. An N value of 0 means the main database file. An N of 1 is
6821	6821	** the "temp" schema. Larger values of N correspond to various ATTACH-ed
6822	6822	** databases.
6823	6823	**
6824	6824	** Space to hold the string that is returned by sqlite3_db_name() is managed
		@@ -6909,20 +6909,20 @@
6909	6909	**
6910	6910	** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
6911	6911	** <dd>The SQLITE_TXN_READ state means that the database is currently
6912	6912	** in a read transaction. Content has been read from the database file
6913	6913	** but nothing in the database file has changed. The transaction state
6914		-** will advanced to SQLITE_TXN_WRITE if any changes occur and there are
	6914	+** will be advanced to SQLITE_TXN_WRITE if any changes occur and there are
6915	6915	** no other conflicting concurrent write transactions. The transaction
6916	6916	** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
6917	6917	** [COMMIT].</dd>
6918	6918	**
6919	6919	** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
6920	6920	** <dd>The SQLITE_TXN_WRITE state means that the database is currently
6921	6921	** in a write transaction. Content has been written to the database file
6922	6922	** but has not yet committed. The transaction state will change to
6923		-** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
	6923	+** SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
6924	6924	*/
6925	6925	#define SQLITE_TXN_NONE 0
6926	6926	#define SQLITE_TXN_READ 1
6927	6927	#define SQLITE_TXN_WRITE 2
6928	6928
		@@ -7199,11 +7199,11 @@
7199	7199
7200	7200	/*
7201	7201	** CAPI3REF: Impose A Limit On Heap Size
7202	7202	**
7203	7203	** These interfaces impose limits on the amount of heap memory that will be
7204		-** by all database connections within a single process.
	7204	+** used by all database connections within a single process.
7205	7205	**
7206	7206	** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
7207	7207	** soft limit on the amount of heap memory that may be allocated by SQLite.
7208	7208	** ^SQLite strives to keep heap memory utilization below the soft heap
7209	7209	** limit by reducing the number of pages held in the page cache
		@@ -7257,11 +7257,11 @@
7257	7257	** by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
7258	7258	** from the heap.
7259	7259	** </ul>)^
7260	7260	**
7261	7261	** The circumstances under which SQLite will enforce the heap limits may
7262		-** changes in future releases of SQLite.
	7262	+** change in future releases of SQLite.
7263	7263	*/
7264	7264	SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
7265	7265	SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
7266	7266
7267	7267	/*
		@@ -7372,12 +7372,12 @@
7372	7372	** be tried also.
7373	7373	**
7374	7374	** ^The entry point is zProc.
7375	7375	** ^(zProc may be 0, in which case SQLite will try to come up with an
7376	7376	** entry point name on its own. It first tries "sqlite3_extension_init".
7377		-** If that does not work, it constructs a name "sqlite3_X_init" where the
7378		-** X is consists of the lower-case equivalent of all ASCII alphabetic
	7377	+** If that does not work, it constructs a name "sqlite3_X_init" where
	7378	+** X consists of the lower-case equivalent of all ASCII alphabetic
7379	7379	** characters in the filename from the last "/" to the first following
7380	7380	** "." and omitting any initial "lib".)^
7381	7381	** ^The sqlite3_load_extension() interface returns
7382	7382	** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
7383	7383	** ^If an error occurs and pzErrMsg is not 0, then the
		@@ -7444,11 +7444,11 @@
7444	7444	** that is to be automatically loaded into all new database connections.
7445	7445	**
7446	7446	** ^(Even though the function prototype shows that xEntryPoint() takes
7447	7447	** no arguments and returns void, SQLite invokes xEntryPoint() with three
7448	7448	** arguments and expects an integer result as if the signature of the
7449		-** entry point where as follows:
	7449	+** entry point were as follows:
7450	7450	**
7451	7451	** <blockquote><pre>
7452	7452	**   int xEntryPoint(
7453	7453	**   sqlite3 *db,
7454	7454	const char pzErrMsg,
		@@ -7608,11 +7608,11 @@
7608	7608	** and becomes the argvIndex-th entry in argv. ^(If aConstraintUsage[].omit
7609	7609	** is true, then the constraint is assumed to be fully handled by the
7610	7610	** virtual table and might not be checked again by the byte code.)^ ^(The
7611	7611	** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
7612	7612	** is left in its default setting of false, the constraint will always be
7613		-** checked separately in byte code. If the omit flag is change to true, then
	7613	+** checked separately in byte code. If the omit flag is changed to true, then
7614	7614	** the constraint may or may not be checked in byte code. In other words,
7615	7615	** when the omit flag is true there is no guarantee that the constraint will
7616	7616	** not be checked again using byte code.)^
7617	7617	**
7618	7618	** ^The idxNum and idxStr values are recorded and passed into the
		@@ -7634,11 +7634,11 @@
7634	7634	** will be returned by the strategy.
7635	7635	**
7636	7636	** The xBestIndex method may optionally populate the idxFlags field with a
7637	7637	** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
7638	7638	** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
7639		-** output to show the idxNum has hex instead of as decimal. Another flag is
	7639	+** output to show the idxNum as hex instead of as decimal. Another flag is
7640	7640	** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
7641	7641	** return at most one row.
7642	7642	**
7643	7643	** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
7644	7644	** SQLite also assumes that if a call to the xUpdate() method is made as
		@@ -7775,11 +7775,11 @@
7775	7775	** by the first parameter. ^The name of the module is given by the
7776	7776	** second parameter. ^The third parameter is a pointer to
7777	7777	** the implementation of the [virtual table module]. ^The fourth
7778	7778	** parameter is an arbitrary client data pointer that is passed through
7779	7779	** into the [xCreate] and [xConnect] methods of the virtual table module
7780		-** when a new virtual table is be being created or reinitialized.
	7780	+** when a new virtual table is being created or reinitialized.
7781	7781	**
7782	7782	** ^The sqlite3_create_module_v2() interface has a fifth parameter which
7783	7783	** is a pointer to a destructor for the pClientData. ^SQLite will
7784	7784	** invoke the destructor function (if it is not NULL) when SQLite
7785	7785	** no longer needs the pClientData pointer. ^The destructor will also
		@@ -7940,11 +7940,11 @@
7940	7940	**
7941	7941	** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
7942	7942	** in *ppBlob. Otherwise an [error code] is returned and, unless the error
7943	7943	** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
7944	7944	** the API is not misused, it is always safe to call [sqlite3_blob_close()]
7945		-** on *ppBlob after this function it returns.
	7945	+** on *ppBlob after this function returns.
7946	7946	**
7947	7947	** This function fails with SQLITE_ERROR if any of the following are true:
7948	7948	** <ul>
7949	7949	** <li> ^(Database zDb does not exist)^,
7950	7950	** <li> ^(Table zTable does not exist within database zDb)^,
		@@ -8060,11 +8060,11 @@
8060	8060	** CAPI3REF: Return The Size Of An Open BLOB
8061	8061	** METHOD: sqlite3_blob
8062	8062	**
8063	8063	** ^Returns the size in bytes of the BLOB accessible via the
8064	8064	** successfully opened [BLOB handle] in its only argument. ^The
8065		-** incremental blob I/O routines can only read or overwriting existing
	8065	+** incremental blob I/O routines can only read or overwrite existing
8066	8066	** blob content; they cannot change the size of a blob.
8067	8067	**
8068	8068	** This routine only works on a [BLOB handle] which has been created
8069	8069	** by a prior successful call to [sqlite3_blob_open()] and which has not
8070	8070	** been closed by [sqlite3_blob_close()]. Passing any other pointer in
		@@ -8210,11 +8210,11 @@
8210	8210	** function that calls sqlite3_initialize().
8211	8211	**
8212	8212	** ^The sqlite3_mutex_alloc() routine allocates a new
8213	8213	** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
8214	8214	** routine returns NULL if it is unable to allocate the requested
8215		-** mutex. The argument to sqlite3_mutex_alloc() must one of these
	8215	+** mutex. The argument to sqlite3_mutex_alloc() must be one of these
8216	8216	** integer constants:
8217	8217	**
8218	8218	** <ul>
8219	8219	** <li> SQLITE_MUTEX_FAST
8220	8220	** <li> SQLITE_MUTEX_RECURSIVE
		@@ -8443,11 +8443,11 @@
8443	8443
8444	8444	/*
8445	8445	** CAPI3REF: Retrieve the mutex for a database connection
8446	8446	** METHOD: sqlite3
8447	8447	**
8448		-** ^This interface returns a pointer the [sqlite3_mutex] object that
	8448	+** ^This interface returns a pointer to the [sqlite3_mutex] object that
8449	8449	** serializes access to the [database connection] given in the argument
8450	8450	** when the [threading mode] is Serialized.
8451	8451	** ^If the [threading mode] is Single-thread or Multi-thread then this
8452	8452	** routine returns a NULL pointer.
8453	8453	*/
		@@ -8566,11 +8566,11 @@
8566	8566
8567	8567	/*
8568	8568	** CAPI3REF: SQL Keyword Checking
8569	8569	**
8570	8570	** These routines provide access to the set of SQL language keywords
8571		-** recognized by SQLite. Applications can uses these routines to determine
	8571	+** recognized by SQLite. Applications can use these routines to determine
8572	8572	** whether or not a specific identifier needs to be escaped (for example,
8573	8573	** by enclosing in double-quotes) so as not to confuse the parser.
8574	8574	**
8575	8575	** The sqlite3_keyword_count() interface returns the number of distinct
8576	8576	** keywords understood by SQLite.
		@@ -8734,11 +8734,11 @@
8734	8734	**
8735	8735	** ^The [sqlite3_str_value(X)] method returns a pointer to the current
8736	8736	** content of the dynamic string under construction in X. The value
8737	8737	** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
8738	8738	** and might be freed or altered by any subsequent method on the same
8739		-** [sqlite3_str] object. Applications must not used the pointer returned
	8739	+** [sqlite3_str] object. Applications must not use the pointer returned by
8740	8740	** [sqlite3_str_value(X)] after any subsequent method call on the same
8741	8741	** object. ^Applications may change the content of the string returned
8742	8742	** by [sqlite3_str_value(X)] as long as they do not write into any bytes
8743	8743	** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
8744	8744	** write any byte after any subsequent sqlite3_str method call.
		@@ -8820,11 +8820,11 @@
8820	8820	** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
8821	8821	** <dd>This parameter returns the number of bytes of page cache
8822	8822	** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
8823	8823	** buffer and where forced to overflow to [sqlite3_malloc()]. The
8824	8824	** returned value includes allocations that overflowed because they
8825		-** where too large (they were larger than the "sz" parameter to
	8825	+** were too large (they were larger than the "sz" parameter to
8826	8826	** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
8827	8827	** no space was left in the page cache.</dd>)^
8828	8828	**
8829	8829	** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
8830	8830	** <dd>This parameter records the largest memory allocation request
		@@ -8904,53 +8904,55 @@
8904	8904	** checked out.</dd>)^
8905	8905	**
8906	8906	** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
8907	8907	** <dd>This parameter returns the number of malloc attempts that were
8908	8908	** satisfied using lookaside memory. Only the high-water value is meaningful;
8909		-** the current value is always zero.)^
	8909	+** the current value is always zero.</dd>)^
8910	8910	**
8911	8911	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
8912	8912	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
8913		-** <dd>This parameter returns the number malloc attempts that might have
	8913	+** <dd>This parameter returns the number of malloc attempts that might have
8914	8914	** been satisfied using lookaside memory but failed due to the amount of
8915	8915	** memory requested being larger than the lookaside slot size.
8916	8916	** Only the high-water value is meaningful;
8917		-** the current value is always zero.)^
	8917	+** the current value is always zero.</dd>)^
8918	8918	**
8919	8919	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
8920	8920	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
8921		-** <dd>This parameter returns the number malloc attempts that might have
	8921	+** <dd>This parameter returns the number of malloc attempts that might have
8922	8922	** been satisfied using lookaside memory but failed due to all lookaside
8923	8923	** memory already being in use.
8924	8924	** Only the high-water value is meaningful;
8925		-** the current value is always zero.)^
	8925	+** the current value is always zero.</dd>)^
8926	8926	**
8927	8927	** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
8928	8928	** <dd>This parameter returns the approximate number of bytes of heap
8929	8929	** memory used by all pager caches associated with the database connection.)^
8930	8930	** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
	8931	+** </dd>
8931	8932	**
8932	8933	** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
8933	8934	** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
8934	8935	** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
8935	8936	** pager cache is shared between two or more connections the bytes of heap
8936	8937	** memory used by that pager cache is divided evenly between the attached
8937	8938	** connections.)^ In other words, if none of the pager caches associated
8938	8939	** with the database connection are shared, this request returns the same
8939		-** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are
	8940	+** value as DBSTATUS_CACHE_USED. Or, if one or more of the pager caches are
8940	8941	** shared, the value returned by this call will be smaller than that returned
8941	8942	** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
8942		-** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.
	8943	+** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.</dd>
8943	8944	**
8944	8945	** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
8945	8946	** <dd>This parameter returns the approximate number of bytes of heap
8946	8947	** memory used to store the schema for all databases associated
8947	8948	** with the connection - main, temp, and any [ATTACH]-ed databases.)^
8948	8949	** ^The full amount of memory used by the schemas is reported, even if the
8949	8950	** schema memory is shared with other database connections due to
8950	8951	** [shared cache mode] being enabled.
8951	8952	** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
	8953	+** </dd>
8952	8954	**
8953	8955	** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
8954	8956	** <dd>This parameter returns the approximate number of bytes of heap
8955	8957	** and lookaside memory used by all prepared statements associated with
8956	8958	** the database connection.)^
		@@ -8983,11 +8985,11 @@
8983	8985	** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
8984	8986	** <dd>This parameter returns the number of dirty cache entries that have
8985	8987	** been written to disk in the middle of a transaction due to the page
8986	8988	** cache overflowing. Transactions are more efficient if they are written
8987	8989	** to disk all at once. When pages spill mid-transaction, that introduces
8988		-** additional overhead. This parameter can be used help identify
	8990	+** additional overhead. This parameter can be used to help identify
8989	8991	** inefficiencies that can be resolved by increasing the cache size.
8990	8992	** </dd>
8991	8993	**
8992	8994	** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
8993	8995	** <dd>This parameter returns zero for the current value if and only if
		@@ -9054,48 +9056,48 @@
9054	9056	** careful use of indices.</dd>
9055	9057	**
9056	9058	** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
9057	9059	** <dd>^This is the number of sort operations that have occurred.
9058	9060	** A non-zero value in this counter may indicate an opportunity to
9059		-** improvement performance through careful use of indices.</dd>
	9061	+** improve performance through careful use of indices.</dd>
9060	9062	**
9061	9063	** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
9062	9064	** <dd>^This is the number of rows inserted into transient indices that
9063	9065	** were created automatically in order to help joins run faster.
9064	9066	** A non-zero value in this counter may indicate an opportunity to
9065		-** improvement performance by adding permanent indices that do not
	9067	+** improve performance by adding permanent indices that do not
9066	9068	** need to be reinitialized each time the statement is run.</dd>
9067	9069	**
9068	9070	** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
9069	9071	** <dd>^This is the number of virtual machine operations executed
9070	9072	** by the prepared statement if that number is less than or equal
9071	9073	** to 2147483647. The number of virtual machine operations can be
9072	9074	** used as a proxy for the total work done by the prepared statement.
9073	9075	** If the number of virtual machine operations exceeds 2147483647
9074		-** then the value returned by this statement status code is undefined.
	9076	+** then the value returned by this statement status code is undefined.</dd>
9075	9077	**
9076	9078	** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
9077	9079	** <dd>^This is the number of times that the prepare statement has been
9078	9080	** automatically regenerated due to schema changes or changes to
9079		-** [bound parameters] that might affect the query plan.
	9081	+** [bound parameters] that might affect the query plan.</dd>
9080	9082	**
9081	9083	** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
9082	9084	** <dd>^This is the number of times that the prepared statement has
9083	9085	** been run. A single "run" for the purposes of this counter is one
9084	9086	** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
9085	9087	** The counter is incremented on the first [sqlite3_step()] call of each
9086		-** cycle.
	9088	+** cycle.</dd>
9087	9089	**
9088	9090	** [[SQLITE_STMTSTATUS_FILTER_MISS]]
9089	9091	** [[SQLITE_STMTSTATUS_FILTER HIT]]
9090	9092	** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
9091	9093	** SQLITE_STMTSTATUS_FILTER_MISS</dt>
9092	9094	** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
9093	9095	** step was bypassed because a Bloom filter returned not-found. The
9094	9096	** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
9095	9097	** times that the Bloom filter returned a find, and thus the join step
9096		-** had to be processed as normal.
	9098	+** had to be processed as normal.</dd>
9097	9099	**
9098	9100	** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
9099	9101	** <dd>^This is the approximate number of bytes of heap memory
9100	9102	** used to store the prepared statement. ^This value is not actually
9101	9103	** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
		@@ -9196,31 +9198,31 @@
9196	9198	** [[the xCreate() page cache methods]]
9197	9199	** ^SQLite invokes the xCreate() method to construct a new cache instance.
9198	9200	** SQLite will typically create one cache instance for each open database file,
9199	9201	** though this is not guaranteed. ^The
9200	9202	** first parameter, szPage, is the size in bytes of the pages that must
9201		-** be allocated by the cache. ^szPage will always a power of two. ^The
	9203	+** be allocated by the cache. ^szPage will always be a power of two. ^The
9202	9204	** second parameter szExtra is a number of bytes of extra storage
9203		-** associated with each page cache entry. ^The szExtra parameter will
	9205	+** associated with each page cache entry. ^The szExtra parameter will be
9204	9206	** a number less than 250. SQLite will use the
9205	9207	** extra szExtra bytes on each page to store metadata about the underlying
9206	9208	** database page on disk. The value passed into szExtra depends
9207	9209	** on the SQLite version, the target platform, and how SQLite was compiled.
9208	9210	** ^The third argument to xCreate(), bPurgeable, is true if the cache being
9209	9211	** created will be used to cache database pages of a file stored on disk, or
9210	9212	** false if it is used for an in-memory database. The cache implementation
9211		-** does not have to do anything special based with the value of bPurgeable;
	9213	+** does not have to do anything special based upon the value of bPurgeable;
9212	9214	** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
9213	9215	** never invoke xUnpin() except to deliberately delete a page.
9214	9216	** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
9215	9217	** false will always have the "discard" flag set to true.
9216		-** ^Hence, a cache created with bPurgeable false will
	9218	+** ^Hence, a cache created with bPurgeable set to false will
9217	9219	** never contain any unpinned pages.
9218	9220	**
9219	9221	** [[the xCachesize() page cache method]]
9220	9222	** ^(The xCachesize() method may be called at any time by SQLite to set the
9221		-** suggested maximum cache-size (number of pages stored by) the cache
	9223	+** suggested maximum cache-size (number of pages stored) for the cache
9222	9224	** instance passed as the first argument. This is the value configured using
9223	9225	** the SQLite "[PRAGMA cache_size]" command.)^ As with the bPurgeable
9224	9226	** parameter, the implementation is not required to do anything with this
9225	9227	** value; it is advisory only.
9226	9228	**
		@@ -9243,16 +9245,16 @@
9243	9245	**
9244	9246	** If the requested page is already in the page cache, then the page cache
9245	9247	** implementation must return a pointer to the page buffer with its content
9246	9248	** intact. If the requested page is not already in the cache, then the
9247	9249	** cache implementation should use the value of the createFlag
9248		-** parameter to help it determined what action to take:
	9250	+** parameter to help it determine what action to take:
9249	9251	**
9250	9252	** <table border=1 width=85% align=center>
9251	9253	** <tr><th> createFlag <th> Behavior when page is not already in cache
9252	9254	** <tr><td> 0 <td> Do not allocate a new page. Return NULL.
9253		-** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
	9255	+** <tr><td> 1 <td> Allocate a new page if it is easy and convenient to do so.
9254	9256	** Otherwise return NULL.
9255	9257	** <tr><td> 2 <td> Make every effort to allocate a new page. Only return
9256	9258	** NULL if allocating a new page is effectively impossible.
9257	9259	** </table>
9258	9260	**
		@@ -9265,11 +9267,11 @@
9265	9267	** [[the xUnpin() page cache method]]
9266	9268	** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
9267	9269	** as its second argument. If the third parameter, discard, is non-zero,
9268	9270	** then the page must be evicted from the cache.
9269	9271	** ^If the discard parameter is
9270		-** zero, then the page may be discarded or retained at the discretion of
	9272	+** zero, then the page may be discarded or retained at the discretion of the
9271	9273	** page cache implementation. ^The page cache implementation
9272	9274	** may choose to evict unpinned pages at any time.
9273	9275	**
9274	9276	** The cache must not perform any reference counting. A single
9275	9277	** call to xUnpin() unpins the page regardless of the number of prior calls
		@@ -9283,11 +9285,11 @@
9283	9285	** to be pinned.
9284	9286	**
9285	9287	** When SQLite calls the xTruncate() method, the cache must discard all
9286	9288	** existing cache entries with page numbers (keys) greater than or equal
9287	9289	** to the value of the iLimit parameter passed to xTruncate(). If any
9288		-** of these pages are pinned, they are implicitly unpinned, meaning that
	9290	+** of these pages are pinned, they become implicitly unpinned, meaning that
9289	9291	** they can be safely discarded.
9290	9292	**
9291	9293	** [[the xDestroy() page cache method]]
9292	9294	** ^The xDestroy() method is used to delete a cache allocated by xCreate().
9293	9295	** All resources associated with the specified cache should be freed. ^After
		@@ -9463,11 +9465,11 @@
9463	9465	** sqlite3_backup_step(), the source database may be modified mid-way
9464	9466	** through the backup process. ^If the source database is modified by an
9465	9467	** external process or via a database connection other than the one being
9466	9468	** used by the backup operation, then the backup will be automatically
9467	9469	** restarted by the next call to sqlite3_backup_step(). ^If the source
9468		-** database is modified by the using the same database connection as is used
	9470	+** database is modified by using the same database connection as is used
9469	9471	** by the backup operation, then the backup database is automatically
9470	9472	** updated at the same time.
9471	9473	**
9472	9474	** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
9473	9475	**
		@@ -9480,11 +9482,11 @@
9480	9482	** active write-transaction on the destination database is rolled back.
9481	9483	** The [sqlite3_backup] object is invalid
9482	9484	** and may not be used following a call to sqlite3_backup_finish().
9483	9485	**
9484	9486	** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
9485		-** sqlite3_backup_step() errors occurred, regardless or whether or not
	9487	+** sqlite3_backup_step() errors occurred, regardless of whether or not
9486	9488	** sqlite3_backup_step() completed.
9487	9489	** ^If an out-of-memory condition or IO error occurred during any prior
9488	9490	** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
9489	9491	** sqlite3_backup_finish() returns the corresponding [error code].
9490	9492	**
		@@ -9582,11 +9584,11 @@
9582	9584	** identity of the database connection (the blocking connection) that
9583	9585	** has locked the required resource is stored internally. ^After an
9584	9586	** application receives an SQLITE_LOCKED error, it may call the
9585	9587	** sqlite3_unlock_notify() method with the blocked connection handle as
9586	9588	** the first argument to register for a callback that will be invoked
9587		-** when the blocking connections current transaction is concluded. ^The
	9589	+** when the blocking connection's current transaction is concluded. ^The
9588	9590	** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
9589	9591	** call that concludes the blocking connection's transaction.
9590	9592	**
9591	9593	** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
9592	9594	** there is a chance that the blocking connection will have already
		@@ -9602,11 +9604,11 @@
9602	9604	** ^(There may be at most one unlock-notify callback registered by a
9603	9605	** blocked connection. If sqlite3_unlock_notify() is called when the
9604	9606	** blocked connection already has a registered unlock-notify callback,
9605	9607	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
9606	9608	** called with a NULL pointer as its second argument, then any existing
9607		-** unlock-notify callback is canceled. ^The blocked connections
	9609	+** unlock-notify callback is canceled. ^The blocked connection's
9608	9610	** unlock-notify callback may also be canceled by closing the blocked
9609	9611	** connection using [sqlite3_close()].
9610	9612	**
9611	9613	** The unlock-notify callback is not reentrant. If an application invokes
9612	9614	** any sqlite3_xxx API functions from within an unlock-notify callback, a
		@@ -10000,11 +10002,11 @@
10000	10002	** where X is an integer. If X is zero, then the [virtual table] whose
10001	10003	** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
10002	10004	** support constraints. In this configuration (which is the default) if
10003	10005	** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
10004	10006	** statement is rolled back as if [ON CONFLICT \| OR ABORT] had been
10005		-** specified as part of the users SQL statement, regardless of the actual
	10007	+** specified as part of the user's SQL statement, regardless of the actual
10006	10008	** ON CONFLICT mode specified.
10007	10009	**
10008	10010	** If X is non-zero, then the virtual table implementation guarantees
10009	10011	** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
10010	10012	** any modifications to internal or persistent data structures have been made.
		@@ -10034,11 +10036,11 @@
10034	10036	** </dd>
10035	10037	**
10036	10038	** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
10037	10039	** <dd>Calls of the form
10038	10040	** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
10039		-** the [xConnect] or [xCreate] methods of a [virtual table] implementation
	10041	+** [xConnect] or [xCreate] methods of a [virtual table] implementation
10040	10042	** identify that virtual table as being safe to use from within triggers
10041	10043	** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
10042	10044	** virtual table can do no serious harm even if it is controlled by a
10043	10045	** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
10044	10046	** flag unless absolutely necessary.
		@@ -10202,21 +10204,21 @@
10202	10204	** <tr><td>2<td>no<td>yes<td>yes
10203	10205	** <tr><td>3<td>yes<td>yes<td>yes
10204	10206	** </table>
10205	10207	**
10206	10208	** ^For the purposes of comparing virtual table output values to see if the
10207		-** values are same value for sorting purposes, two NULL values are considered
	10209	+** values are the same value for sorting purposes, two NULL values are considered
10208	10210	** to be the same. In other words, the comparison operator is "IS"
10209	10211	** (or "IS NOT DISTINCT FROM") and not "==".
10210	10212	**
10211	10213	** If a virtual table implementation is unable to meet the requirements
10212	10214	** specified above, then it must not set the "orderByConsumed" flag in the
10213	10215	** [sqlite3_index_info] object or an incorrect answer may result.
10214	10216	**
10215	10217	** ^A virtual table implementation is always free to return rows in any order
10216	10218	** it wants, as long as the "orderByConsumed" flag is not set. ^When the
10217		-** the "orderByConsumed" flag is unset, the query planner will add extra
	10219	+** "orderByConsumed" flag is unset, the query planner will add extra
10218	10220	** [bytecode] to ensure that the final results returned by the SQL query are
10219	10221	** ordered correctly. The use of the "orderByConsumed" flag and the
10220	10222	** sqlite3_vtab_distinct() interface is merely an optimization. ^Careful
10221	10223	** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
10222	10224	** flag might help queries against a virtual table to run faster. Being
		@@ -10309,11 +10311,11 @@
10309	10311	**
10310	10312	** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
10311	10313	** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
10312	10314	** xFilter method which invokes these routines, and specifically
10313	10315	** a parameter that was previously selected for all-at-once IN constraint
10314		-** processing use the [sqlite3_vtab_in()] interface in the
	10316	+** processing using the [sqlite3_vtab_in()] interface in the
10315	10317	** [xBestIndex\|xBestIndex method]. ^(If the X parameter is not
10316	10318	** an xFilter argument that was selected for all-at-once IN constraint
10317	10319	** processing, then these routines return [SQLITE_ERROR].)^
10318	10320	**
10319	10321	** ^(Use these routines to access all values on the right-hand side
		@@ -10364,11 +10366,11 @@
10364	10366	** right-hand operand is not known, then *V is set to a NULL pointer.
10365	10367	** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
10366	10368	** and only if *V is set to a value. ^The sqlite3_vtab_rhs_value(P,J,V)
10367	10369	** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
10368	10370	** constraint is not available. ^The sqlite3_vtab_rhs_value() interface
10369		-** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
	10371	+** can return a result code other than SQLITE_OK or SQLITE_NOTFOUND if
10370	10372	** something goes wrong.
10371	10373	**
10372	10374	** The sqlite3_vtab_rhs_value() interface is usually only successful if
10373	10375	** the right-hand operand of a constraint is a literal value in the original
10374	10376	** SQL statement. If the right-hand operand is an expression or a reference
		@@ -10392,12 +10394,12 @@
10392	10394	/*
10393	10395	** CAPI3REF: Conflict resolution modes
10394	10396	** KEYWORDS: {conflict resolution mode}
10395	10397	**
10396	10398	** These constants are returned by [sqlite3_vtab_on_conflict()] to
10397		-** inform a [virtual table] implementation what the [ON CONFLICT] mode
10398		-** is for the SQL statement being evaluated.
	10399	+** inform a [virtual table] implementation of the [ON CONFLICT] mode
	10400	+** for the SQL statement being evaluated.
10399	10401	**
10400	10402	** Note that the [SQLITE_IGNORE] constant is also used as a potential
10401	10403	** return value from the [sqlite3_set_authorizer()] callback and that
10402	10404	** [SQLITE_ABORT] is also a [result code].
10403	10405	*/
		@@ -10433,43 +10435,43 @@
10433	10435	** to the total number of rows examined by all iterations of the X-th loop.</dd>
10434	10436	**
10435	10437	** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
10436	10438	** <dd>^The "double" variable pointed to by the V parameter will be set to the
10437	10439	** query planner's estimate for the average number of rows output from each
10438		-** iteration of the X-th loop. If the query planner's estimates was accurate,
	10440	+** iteration of the X-th loop. If the query planner's estimate was accurate,
10439	10441	** then this value will approximate the quotient NVISIT/NLOOP and the
10440	10442	** product of this value for all prior loops with the same SELECTID will
10441		-** be the NLOOP value for the current loop.
	10443	+** be the NLOOP value for the current loop.</dd>
10442	10444	**
10443	10445	** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
10444	10446	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10445	10447	** to a zero-terminated UTF-8 string containing the name of the index or table
10446		-** used for the X-th loop.
	10448	+** used for the X-th loop.</dd>
10447	10449	**
10448	10450	** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
10449	10451	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10450	10452	** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
10451		-** description for the X-th loop.
	10453	+** description for the X-th loop.</dd>
10452	10454	**
10453	10455	** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
10454	10456	** <dd>^The "int" variable pointed to by the V parameter will be set to the
10455	10457	** id for the X-th query plan element. The id value is unique within the
10456	10458	** statement. The select-id is the same value as is output in the first
10457		-** column of an [EXPLAIN QUERY PLAN] query.
	10459	+** column of an [EXPLAIN QUERY PLAN] query.</dd>
10458	10460	**
10459	10461	** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
10460	10462	** <dd>The "int" variable pointed to by the V parameter will be set to the
10461		-** the id of the parent of the current query element, if applicable, or
	10463	+** id of the parent of the current query element, if applicable, or
10462	10464	** to zero if the query element has no parent. This is the same value as
10463		-** returned in the second column of an [EXPLAIN QUERY PLAN] query.
	10465	+** returned in the second column of an [EXPLAIN QUERY PLAN] query.</dd>
10464	10466	**
10465	10467	** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
10466	10468	** <dd>The sqlite3_int64 output value is set to the number of cycles,
10467	10469	** according to the processor time-stamp counter, that elapsed while the
10468	10470	** query element was being processed. This value is not available for
10469	10471	** all query elements - if it is unavailable the output variable is
10470		-** set to -1.
	10472	+** set to -1.</dd>
10471	10473	** </dl>
10472	10474	*/
10473	10475	#define SQLITE_SCANSTAT_NLOOP 0
10474	10476	#define SQLITE_SCANSTAT_NVISIT 1
10475	10477	#define SQLITE_SCANSTAT_EST 2
		@@ -10506,12 +10508,12 @@
10506	10508	** the EXPLAIN QUERY PLAN output) are available. Invoking API
10507	10509	** sqlite3_stmt_scanstatus() is equivalent to calling
10508	10510	** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
10509	10511	**
10510	10512	** Parameter "idx" identifies the specific query element to retrieve statistics
10511		-** for. Query elements are numbered starting from zero. A value of -1 may be
10512		-** to query for statistics regarding the entire query. ^If idx is out of range
	10513	+** for. Query elements are numbered starting from zero. A value of -1 may
	10514	+** retrieve statistics for the entire query. ^If idx is out of range
10513	10515	** - less than -1 or greater than or equal to the total number of query
10514	10516	** elements used to implement the statement - a non-zero value is returned and
10515	10517	** the variable that pOut points to is unchanged.
10516	10518	**
10517	10519	** See also: [sqlite3_stmt_scanstatus_reset()]
		@@ -10550,11 +10552,11 @@
10550	10552	/*
10551	10553	** CAPI3REF: Flush caches to disk mid-transaction
10552	10554	** METHOD: sqlite3
10553	10555	**
10554	10556	** ^If a write-transaction is open on [database connection] D when the
10555		-** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
	10557	+** [sqlite3_db_cacheflush(D)] interface is invoked, any dirty
10556	10558	** pages in the pager-cache that are not currently in use are written out
10557	10559	** to disk. A dirty page may be in use if a database cursor created by an
10558	10560	** active SQL statement is reading from it, or if it is page 1 of a database
10559	10561	** file (page 1 is always "in use"). ^The [sqlite3_db_cacheflush(D)]
10560	10562	** interface flushes caches for all schemas - "main", "temp", and
		@@ -10664,12 +10666,12 @@
10664	10666	** operation; or 1 for inserts, updates, or deletes invoked by top-level
10665	10667	** triggers; or 2 for changes resulting from triggers called by top-level
10666	10668	** triggers; and so forth.
10667	10669	**
10668	10670	** When the [sqlite3_blob_write()] API is used to update a blob column,
10669		-** the pre-update hook is invoked with SQLITE_DELETE. This is because the
10670		-** in this case the new values are not available. In this case, when a
	10671	+** the pre-update hook is invoked with SQLITE_DELETE, because
	10672	+** the new values are not yet available. In this case, when a
10671	10673	** callback made with op==SQLITE_DELETE is actually a write using the
10672	10674	** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
10673	10675	** the index of the column being written. In other cases, where the
10674	10676	** pre-update hook is being invoked for some other reason, including a
10675	10677	** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
		@@ -10918,20 +10920,20 @@
10918	10920	** is written into *P.
10919	10921	**
10920	10922	** For an ordinary on-disk database file, the serialization is just a
10921	10923	** copy of the disk file. For an in-memory database or a "TEMP" database,
10922	10924	** the serialization is the same sequence of bytes which would be written
10923		-** to disk if that database where backed up to disk.
	10925	+** to disk if that database were backed up to disk.
10924	10926	**
10925	10927	** The usual case is that sqlite3_serialize() copies the serialization of
10926	10928	** the database into memory obtained from [sqlite3_malloc64()] and returns
10927	10929	** a pointer to that memory. The caller is responsible for freeing the
10928	10930	** returned value to avoid a memory leak. However, if the F argument
10929	10931	** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
10930	10932	** are made, and the sqlite3_serialize() function will return a pointer
10931	10933	** to the contiguous memory representation of the database that SQLite
10932		-** is currently using for that database, or NULL if the no such contiguous
	10934	+** is currently using for that database, or NULL if no such contiguous
10933	10935	** memory representation of the database exists. A contiguous memory
10934	10936	** representation of the database will usually only exist if there has
10935	10937	** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
10936	10938	** values of D and S.
10937	10939	** The size of the database is written into *P even if the
		@@ -10998,11 +11000,11 @@
10998	11000	**
10999	11001	** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
11000	11002	** database is currently in a read transaction or is involved in a backup
11001	11003	** operation.
11002	11004	**
11003		-** It is not possible to deserialized into the TEMP database. If the
	11005	+** It is not possible to deserialize into the TEMP database. If the
11004	11006	** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
11005	11007	** function returns SQLITE_ERROR.
11006	11008	**
11007	11009	** The deserialized database should not be in [WAL mode]. If the database
11008	11010	** is in WAL mode, then any attempt to use the database file will result
		@@ -11020,19 +11022,19 @@
11020	11022	*/
11021	11023	SQLITE_API int sqlite3_deserialize(
11022	11024	sqlite3 db, / The database connection */
11023	11025	const char zSchema, / Which DB to reopen with the deserialization */
11024	11026	unsigned char pData, / The serialized database content */
11025		- sqlite3_int64 szDb, /* Number bytes in the deserialization */
	11027	+ sqlite3_int64 szDb, /* Number of bytes in the deserialization */
11026	11028	sqlite3_int64 szBuf, /* Total size of buffer pData[] */
11027	11029	unsigned mFlags /* Zero or more SQLITE_DESERIALIZE_* flags */
11028	11030	);
11029	11031
11030	11032	/*
11031	11033	** CAPI3REF: Flags for sqlite3_deserialize()
11032	11034	**
11033		-** The following are allowed values for 6th argument (the F argument) to
	11035	+** The following are allowed values for the 6th argument (the F argument) to
11034	11036	** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
11035	11037	**
11036	11038	** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
11037	11039	** in the P argument is held in memory obtained from [sqlite3_malloc64()]
11038	11040	** and that SQLite should take ownership of this memory and automatically
		@@ -11553,13 +11555,14 @@
11553	11555	** This may appear to have some counter-intuitive effects if a single row
11554	11556	** is written to more than once during a session. For example, if a row
11555	11557	** is inserted while a session object is enabled, then later deleted while
11556	11558	** the same session object is disabled, no INSERT record will appear in the
11557	11559	** changeset, even though the delete took place while the session was disabled.
11558		-** Or, if one field of a row is updated while a session is disabled, and
11559		-** another field of the same row is updated while the session is enabled, the
11560		-** resulting changeset will contain an UPDATE change that updates both fields.
	11560	+** Or, if one field of a row is updated while a session is enabled, and
	11561	+** then another field of the same row is updated while the session is disabled,
	11562	+** the resulting changeset will contain an UPDATE change that updates both
	11563	+** fields.
11561	11564	*/
11562	11565	SQLITE_API int sqlite3session_changeset(
11563	11566	sqlite3_session pSession, / Session object */
11564	11567	int pnChangeset, / OUT: Size of buffer at ppChangeset /
11565	11568	void *ppChangeset / OUT: Buffer containing changeset */
		@@ -11764,11 +11767,11 @@
11764	11767	** CAPI3REF: Flags for sqlite3changeset_start_v2
11765	11768	**
11766	11769	** The following flags may passed via the 4th parameter to
11767	11770	** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
11768	11771	**
11769		-** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
	11772	+** <dt>SQLITE_CHANGESETSTART_INVERT <dd>
11770	11773	** Invert the changeset while iterating through it. This is equivalent to
11771	11774	** inverting a changeset using sqlite3changeset_invert() before applying it.
11772	11775	** It is an error to specify this flag with a patchset.
11773	11776	*/
11774	11777	#define SQLITE_CHANGESETSTART_INVERT 0x0002
		@@ -12309,17 +12312,26 @@
12309	12312	** Apply a changeset or patchset to a database. These functions attempt to
12310	12313	** update the "main" database attached to handle db with the changes found in
12311	12314	** the changeset passed via the second and third arguments.
12312	12315	**
12313	12316	** The fourth argument (xFilter) passed to these functions is the "filter
12314		-** callback". If it is not NULL, then for each table affected by at least one
12315		-** change in the changeset, the filter callback is invoked with
12316		-** the table name as the second argument, and a copy of the context pointer
12317		-** passed as the sixth argument as the first. If the "filter callback"
12318		-** returns zero, then no attempt is made to apply any changes to the table.
12319		-** Otherwise, if the return value is non-zero or the xFilter argument to
12320		-** is NULL, all changes related to the table are attempted.
	12317	+** callback". This may be passed NULL, in which case all changes in the
	12318	+** changeset are applied to the database. For sqlite3changeset_apply() and
	12319	+** sqlite3_changeset_apply_v2(), if it is not NULL, then it is invoked once
	12320	+** for each table affected by at least one change in the changeset. In this
	12321	+** case the table name is passed as the second argument, and a copy of
	12322	+** the context pointer passed as the sixth argument to apply() or apply_v2()
	12323	+** as the first. If the "filter callback" returns zero, then no attempt is
	12324	+** made to apply any changes to the table. Otherwise, if the return value is
	12325	+** non-zero, all changes related to the table are attempted.
	12326	+**
	12327	+** For sqlite3_changeset_apply_v3(), the xFilter callback is invoked once
	12328	+** per change. The second argument in this case is an sqlite3_changeset_iter
	12329	+** that may be queried using the usual APIs for the details of the current
	12330	+** change. If the "filter callback" returns zero in this case, then no attempt
	12331	+** is made to apply the current change. If it returns non-zero, the change
	12332	+** is applied.
12321	12333	**
12322	12334	** For each table that is not excluded by the filter callback, this function
12323	12335	** tests that the target database contains a compatible table. A table is
12324	12336	** considered compatible if all of the following are true:
12325	12337	**
		@@ -12336,15 +12348,15 @@
12336	12348	** changes associated with the table are applied. A warning message is issued
12337	12349	** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
12338	12350	** one such warning is issued for each table in the changeset.
12339	12351	**
12340	12352	** For each change for which there is a compatible table, an attempt is made
12341		-** to modify the table contents according to the UPDATE, INSERT or DELETE
12342		-** change. If a change cannot be applied cleanly, the conflict handler
12343		-** function passed as the fifth argument to sqlite3changeset_apply() may be
12344		-** invoked. A description of exactly when the conflict handler is invoked for
12345		-** each type of change is below.
	12353	+** to modify the table contents according to each UPDATE, INSERT or DELETE
	12354	+** change that is not excluded by a filter callback. If a change cannot be
	12355	+** applied cleanly, the conflict handler function passed as the fifth argument
	12356	+** to sqlite3changeset_apply() may be invoked. A description of exactly when
	12357	+** the conflict handler is invoked for each type of change is below.
12346	12358	**
12347	12359	** Unlike the xFilter argument, xConflict may not be passed NULL. The results
12348	12360	** of passing anything other than a valid function pointer as the xConflict
12349	12361	** argument are undefined.
12350	12362	**
		@@ -12482,10 +12494,27 @@
12482	12494	void pChangeset, / Changeset blob */
12483	12495	int(*xFilter)(
12484	12496	void pCtx, / Copy of sixth arg to _apply() */
12485	12497	const char zTab / Table name */
12486	12498	),
	12499	+ int(*xConflict)(
	12500	+ void pCtx, / Copy of sixth arg to _apply() */
	12501	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	12502	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	12503	+ ),
	12504	+ void pCtx, / First argument passed to xConflict */
	12505	+ void *ppRebase, int pnRebase, /* OUT: Rebase data */
	12506	+ int flags /* SESSION_CHANGESETAPPLY_* flags */
	12507	+);
	12508	+SQLITE_API int sqlite3changeset_apply_v3(
	12509	+ sqlite3 db, / Apply change to "main" db of this handle */
	12510	+ int nChangeset, /* Size of changeset in bytes */
	12511	+ void pChangeset, / Changeset blob */
	12512	+ int(*xFilter)(
	12513	+ void pCtx, / Copy of sixth arg to _apply() */
	12514	+ sqlite3_changeset_iter p / Handle describing change */
	12515	+ ),
12487	12516	int(*xConflict)(
12488	12517	void pCtx, / Copy of sixth arg to _apply() */
12489	12518	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12490	12519	sqlite3_changeset_iter p / Handle describing change and conflict */
12491	12520	),
		@@ -12901,10 +12930,27 @@
12901	12930	void pIn, / First arg for xInput */
12902	12931	int(*xFilter)(
12903	12932	void pCtx, / Copy of sixth arg to _apply() */
12904	12933	const char zTab / Table name */
12905	12934	),
	12935	+ int(*xConflict)(
	12936	+ void pCtx, / Copy of sixth arg to _apply() */
	12937	+ int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
	12938	+ sqlite3_changeset_iter p / Handle describing change and conflict */
	12939	+ ),
	12940	+ void pCtx, / First argument passed to xConflict */
	12941	+ void *ppRebase, int pnRebase,
	12942	+ int flags
	12943	+);
	12944	+SQLITE_API int sqlite3changeset_apply_v3_strm(
	12945	+ sqlite3 db, / Apply change to "main" db of this handle */
	12946	+ int (xInput)(void pIn, void pData, int pnData), /* Input function */
	12947	+ void pIn, / First arg for xInput */
	12948	+ int(*xFilter)(
	12949	+ void pCtx, / Copy of sixth arg to _apply() */
	12950	+ sqlite3_changeset_iter *p
	12951	+ ),
12906	12952	int(*xConflict)(
12907	12953	void pCtx, / Copy of sixth arg to _apply() */
12908	12954	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12909	12955	sqlite3_changeset_iter p / Handle describing change and conflict */
12910	12956	),
12911	12957

	--- extsrc/sqlite3.h
	+++ extsrc/sqlite3.h
	@@ -144,13 +144,13 @@
144	**
145	** See also: [sqlite3_libversion()],
146	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147	** [sqlite_version()] and [sqlite_source_id()].
148	*/
149	#define SQLITE_VERSION "3.50.0"
150	#define SQLITE_VERSION_NUMBER 3050000
151	#define SQLITE_SOURCE_ID "2025-04-15 21:59:38 d22475b81c4e26ccc50f3b5626d43b32f7a2de34e5a764539554665bdda735d5"
152
153	/*
154	** CAPI3REF: Run-Time Library Version Numbers
155	** KEYWORDS: sqlite3_version sqlite3_sourceid
156	**
	@@ -166,13 +166,13 @@
166	** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
167	** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
168	** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
169	** </pre></blockquote>)^
170	**
171	** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
172	** macro. ^The sqlite3_libversion() function returns a pointer to the
173	** to the sqlite3_version[] string constant. The sqlite3_libversion()
174	** function is provided for use in DLLs since DLL users usually do not have
175	** direct access to string constants within the DLL. ^The
176	** sqlite3_libversion_number() function returns an integer equal to
177	** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
178	** a pointer to a string constant whose value is the same as the
	@@ -368,11 +368,11 @@
368	** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
369	** that allows an application to run multiple statements of SQL
370	** without having to use a lot of C code.
371	**
372	** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
373	** semicolon-separate SQL statements passed into its 2nd argument,
374	** in the context of the [database connection] passed in as its 1st
375	** argument. ^If the callback function of the 3rd argument to
376	** sqlite3_exec() is not NULL, then it is invoked for each result row
377	** coming out of the evaluated SQL statements. ^The 4th argument to
378	** sqlite3_exec() is relayed through to the 1st argument of each
	@@ -401,11 +401,11 @@
401	** callback is an array of pointers to strings obtained as if from
402	** [sqlite3_column_text()], one for each column. ^If an element of a
403	** result row is NULL then the corresponding string pointer for the
404	** sqlite3_exec() callback is a NULL pointer. ^The 4th argument to the
405	** sqlite3_exec() callback is an array of pointers to strings where each
406	** entry represents the name of corresponding result column as obtained
407	** from [sqlite3_column_name()].
408	**
409	** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
410	** to an empty string, or a pointer that contains only whitespace and/or
411	** SQL comments, then no SQL statements are evaluated and the database
	@@ -587,11 +587,11 @@
587	** Applications should not depend on the historical behavior.
588	**
589	** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
590	** [sqlite3_open_v2()] does not cause the underlying database file
591	** to be opened using O_EXCL. Passing SQLITE_OPEN_EXCLUSIVE into
592	** [sqlite3_open_v2()] has historically be a no-op and might become an
593	** error in future versions of SQLite.
594	*/
595	#define SQLITE_OPEN_READONLY 0x00000001 /* Ok for sqlite3_open_v2() */
596	#define SQLITE_OPEN_READWRITE 0x00000002 /* Ok for sqlite3_open_v2() */
597	#define SQLITE_OPEN_CREATE 0x00000004 /* Ok for sqlite3_open_v2() */
	@@ -681,11 +681,11 @@
681	** CAPI3REF: File Locking Levels
682	**
683	** SQLite uses one of these integer values as the second
684	** argument to calls it makes to the xLock() and xUnlock() methods
685	** of an [sqlite3_io_methods] object. These values are ordered from
686	** lest restrictive to most restrictive.
687	**
688	** The argument to xLock() is always SHARED or higher. The argument to
689	** xUnlock is either SHARED or NONE.
690	*/
691	#define SQLITE_LOCK_NONE 0 /* xUnlock() only */
	@@ -997,11 +997,11 @@
997	** reason, the entire database file will be overwritten by the current
998	** transaction. This is used by VACUUM operations.
999	**
1000	** <li>[[SQLITE_FCNTL_VFSNAME]]
1001	** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
1002	** all [VFSes] in the VFS stack. The names are of all VFS shims and the
1003	** final bottom-level VFS are written into memory obtained from
1004	** [sqlite3_malloc()] and the result is stored in the char* variable
1005	** that the fourth parameter of [sqlite3_file_control()] points to.
1006	** The caller is responsible for freeing the memory when done. As with
1007	** all file-control actions, there is no guarantee that this will actually
	@@ -1011,11 +1011,11 @@
1011	**
1012	** <li>[[SQLITE_FCNTL_VFS_POINTER]]
1013	** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
1014	** [VFSes] currently in use. ^(The argument X in
1015	** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
1016	of type "[sqlite3_vfs] ". This opcodes will set *X
1017	** to a pointer to the top-level VFS.)^
1018	** ^When there are multiple VFS shims in the stack, this opcode finds the
1019	** upper-most shim only.
1020	**
1021	** <li>[[SQLITE_FCNTL_PRAGMA]]
	@@ -1201,11 +1201,11 @@
1201	** record the fact that the pages have been checkpointed.
1202	**
1203	** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
1204	** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
1205	** whether or not there is a database client in another process with a wal-mode
1206	** transaction open on the database or not. It is only available on unix.The
1207	** (void*) argument passed with this file-control should be a pointer to a
1208	** value of type (int). The integer value is set to 1 if the database is a wal
1209	** mode database and there exists at least one client in another process that
1210	** currently has an SQL transaction open on the database. It is set to 0 if
1211	** the database is not a wal-mode db, or if there is no such connection in any
	@@ -1626,11 +1626,11 @@
1626	**
1627	** ^The sqlite3_initialize() routine is called internally by many other
1628	** SQLite interfaces so that an application usually does not need to
1629	** invoke sqlite3_initialize() directly. For example, [sqlite3_open()]
1630	** calls sqlite3_initialize() so the SQLite library will be automatically
1631	** initialized when [sqlite3_open()] is called if it has not be initialized
1632	** already. ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
1633	** compile-time option, then the automatic calls to sqlite3_initialize()
1634	** are omitted and the application must call sqlite3_initialize() directly
1635	** prior to using any other SQLite interface. For maximum portability,
1636	** it is recommended that applications always invoke sqlite3_initialize()
	@@ -1883,25 +1883,25 @@
1883	** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
1884	** is a pointer to an instance of the [sqlite3_mem_methods] structure.
1885	** The [sqlite3_mem_methods]
1886	** structure is filled with the currently defined memory allocation routines.)^
1887	** This option can be used to overload the default memory allocation
1888	** routines with a wrapper that simulations memory allocation failure or
1889	** tracks memory usage, for example. </dd>
1890	**
1891	** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
1892	** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
1893	** type int, interpreted as a boolean, which if true provides a hint to
1894	** SQLite that it should avoid large memory allocations if possible.
1895	** SQLite will run faster if it is free to make large memory allocations,
1896	** but some application might prefer to run slower in exchange for
1897	** guarantees about memory fragmentation that are possible if large
1898	** allocations are avoided. This hint is normally off.
1899	** </dd>
1900	**
1901	** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
1902	** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
1903	** interpreted as a boolean, which enables or disables the collection of
1904	** memory allocation statistics. ^(When memory allocation statistics are
1905	** disabled, the following SQLite interfaces become non-operational:
1906	** <ul>
1907	** <li> [sqlite3_hard_heap_limit64()]
	@@ -1942,11 +1942,11 @@
1942	** a page cache line is larger than sz bytes or if all of the pMem buffer
1943	** is exhausted.
1944	** ^If pMem is NULL and N is non-zero, then each database connection
1945	** does an initial bulk allocation for page cache memory
1946	** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
1947	** of -1024*N bytes if N is negative, . ^If additional
1948	** page cache memory is needed beyond what is provided by the initial
1949	** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
1950	** additional cache line. </dd>
1951	**
1952	** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
	@@ -1971,11 +1971,11 @@
1971	**
1972	** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
1973	** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
1974	** pointer to an instance of the [sqlite3_mutex_methods] structure.
1975	** The argument specifies alternative low-level mutex routines to be used
1976	** in place the mutex routines built into SQLite.)^ ^SQLite makes a copy of
1977	** the content of the [sqlite3_mutex_methods] structure before the call to
1978	** [sqlite3_config()] returns. ^If SQLite is compiled with
1979	** the [SQLITE_THREADSAFE \| SQLITE_THREADSAFE=0] compile-time option then
1980	** the entire mutexing subsystem is omitted from the build and hence calls to
1981	** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
	@@ -2013,11 +2013,11 @@
2013	** the interface to a custom page cache implementation.)^
2014	** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
2015	**
2016	** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
2017	** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
2018	** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies of
2019	** the current page cache implementation into that object.)^ </dd>
2020	**
2021	** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
2022	** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
2023	** global [error log].
	@@ -2030,11 +2030,11 @@
2030	** passed through as the first parameter to the application-defined logger
2031	** function whenever that function is invoked. ^The second parameter to
2032	** the logger function is a copy of the first parameter to the corresponding
2033	** [sqlite3_log()] call and is intended to be a [result code] or an
2034	** [extended result code]. ^The third parameter passed to the logger is
2035	** log message after formatting via [sqlite3_snprintf()].
2036	** The SQLite logging interface is not reentrant; the logger function
2037	** supplied by the application must not invoke any SQLite interface.
2038	** In a multi-threaded application, the application-defined logger
2039	** function must be threadsafe. </dd>
2040	**
	@@ -2221,11 +2221,11 @@
2221	** CAPI3REF: Database Connection Configuration Options
2222	**
2223	** These constants are the available integer configuration options that
2224	** can be passed as the second parameter to the [sqlite3_db_config()] interface.
2225	**
2226	** The [sqlite3_db_config()] interface is a var-args functions. It takes a
2227	** variable number of parameters, though always at least two. The number of
2228	** parameters passed into sqlite3_db_config() depends on which of these
2229	** constants is given as the second parameter. This documentation page
2230	** refers to parameters beyond the second as "arguments". Thus, when this
2231	** page says "the N-th argument" it means "the N-th parameter past the
	@@ -2355,12 +2355,12 @@
2355	** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
2356	** There must be two additional arguments.
2357	** When the first argument to this interface is 1, then only the C-API is
2358	** enabled and the SQL function remains disabled. If the first argument to
2359	** this interface is 0, then both the C-API and the SQL function are disabled.
2360	** If the first argument is -1, then no changes are made to state of either the
2361	** C-API or the SQL function.
2362	** The second parameter is a pointer to an integer into which
2363	** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
2364	** is disabled or enabled following this call. The second parameter may
2365	** be a NULL pointer, in which case the new setting is not reported back.
2366	** </dd>
	@@ -2474,11 +2474,11 @@
2474	** </dd>
2475	**
2476	** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
2477	** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
2478	** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
2479	** the legacy behavior of the [ALTER TABLE RENAME] command such it
2480	** behaves as it did prior to [version 3.24.0] (2018-06-04). See the
2481	** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
2482	** additional information. This feature can also be turned on and off
2483	** using the [PRAGMA legacy_alter_table] statement.
2484	** </dd>
	@@ -2523,11 +2523,11 @@
2523	**
2524	** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
2525	** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
2526	** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
2527	** the legacy file format flag. When activated, this flag causes all newly
2528	** created database file to have a schema format version number (the 4-byte
2529	** integer found at offset 44 into the database header) of 1. This in turn
2530	** means that the resulting database file will be readable and writable by
2531	** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
2532	** newly created databases are generally not understandable by SQLite versions
2533	** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
	@@ -2550,11 +2550,11 @@
2550	** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2551	** statistics. For statistics to be collected, the flag must be set on
2552	** the database handle both when the SQL statement is prepared and when it
2553	** is stepped. The flag is set (collection of statistics is enabled)
2554	** by default. <p>This option takes two arguments: an integer and a pointer to
2555	** an integer.. The first argument is 1, 0, or -1 to enable, disable, or
2556	** leave unchanged the statement scanstatus option. If the second argument
2557	** is not NULL, then the value of the statement scanstatus setting after
2558	** processing the first argument is written into the integer that the second
2559	** argument points to.
2560	** </dd>
	@@ -2593,12 +2593,12 @@
2593	** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
2594	** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
2595	** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
2596	** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
2597	** This capability is enabled by default. Applications can disable or
2598	** reenable this capability using the current DBCONFIG option. If the
2599	** the this capability is disabled, the [ATTACH] command will still work,
2600	** but the database will be opened read-only. If this option is disabled,
2601	** then the ability to create a new database using [ATTACH] is also disabled,
2602	** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
2603	** option.<p>
2604	** This option takes two arguments which are an integer and a pointer
	@@ -2628,11 +2628,11 @@
2628	**
2629	** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
2630	**
2631	** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
2632	** overall call to [sqlite3_db_config()] has a total of four parameters.
2633	** The first argument (the third parameter to sqlite3_db_config()) is a integer.
2634	** The second argument is a pointer to an integer. If the first argument is 1,
2635	** then the option becomes enabled. If the first integer argument is 0, then the
2636	** option is disabled. If the first argument is -1, then the option setting
2637	** is unchanged. The second argument, the pointer to an integer, may be NULL.
2638	** If the second argument is not NULL, then a value of 0 or 1 is written into
	@@ -2918,11 +2918,11 @@
2918	** and comments that follow the final semicolon are ignored.
2919	**
2920	** ^These routines return 0 if the statement is incomplete. ^If a
2921	** memory allocation fails, then SQLITE_NOMEM is returned.
2922	**
2923	** ^These routines do not parse the SQL statements thus
2924	** will not detect syntactically incorrect SQL.
2925	**
2926	** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
2927	** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
2928	** automatically by sqlite3_complete16(). If that initialization fails,
	@@ -3035,11 +3035,11 @@
3035	** Passing 0 to this function disables blocking locks altogether. Passing
3036	** -1 to this function requests that the VFS blocks for a long time -
3037	** indefinitely if possible. The results of passing any other negative value
3038	** are undefined.
3039	**
3040	** Internally, each SQLite database handle store two timeout values - the
3041	** busy-timeout (used for rollback mode databases, or if the VFS does not
3042	** support blocking locks) and the setlk-timeout (used for blocking locks
3043	** on wal-mode databases). The sqlite3_busy_timeout() method sets both
3044	** values, this function sets only the setlk-timeout value. Therefore,
3045	** to configure separate busy-timeout and setlk-timeout values for a single
	@@ -3065,11 +3065,11 @@
3065	** METHOD: sqlite3
3066	**
3067	** This is a legacy interface that is preserved for backwards compatibility.
3068	** Use of this interface is not recommended.
3069	**
3070	** Definition: A <b>result table</b> is memory data structure created by the
3071	** [sqlite3_get_table()] interface. A result table records the
3072	** complete query results from one or more queries.
3073	**
3074	** The table conceptually has a number of rows and columns. But
3075	** these numbers are not part of the result table itself. These
	@@ -3208,11 +3208,11 @@
3208	** of a signed 32-bit integer.
3209	**
3210	** ^Calling sqlite3_free() with a pointer previously returned
3211	** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
3212	** that it might be reused. ^The sqlite3_free() routine is
3213	** a no-op if is called with a NULL pointer. Passing a NULL pointer
3214	** to sqlite3_free() is harmless. After being freed, memory
3215	** should neither be read nor written. Even reading previously freed
3216	** memory might result in a segmentation fault or other severe error.
3217	** Memory corruption, a segmentation fault, or other severe error
3218	** might result if sqlite3_free() is called with a non-NULL pointer that
	@@ -3226,17 +3226,17 @@
3226	** ^If the N parameter to sqlite3_realloc(X,N) is zero or
3227	** negative then the behavior is exactly the same as calling
3228	** sqlite3_free(X).
3229	** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
3230	** of at least N bytes in size or NULL if insufficient memory is available.
3231	** ^If M is the size of the prior allocation, then min(N,M) bytes
3232	** of the prior allocation are copied into the beginning of buffer returned
3233	** by sqlite3_realloc(X,N) and the prior allocation is freed.
3234	** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
3235	** prior allocation is not freed.
3236	**
3237	** ^The sqlite3_realloc64(X,N) interfaces works the same as
3238	** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
3239	** of a 32-bit signed integer.
3240	**
3241	** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
3242	** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
	@@ -3282,11 +3282,11 @@
3282	** ^The [sqlite3_memory_highwater()] routine returns the maximum
3283	** value of [sqlite3_memory_used()] since the high-water mark
3284	** was last reset. ^The values returned by [sqlite3_memory_used()] and
3285	** [sqlite3_memory_highwater()] include any overhead
3286	** added by SQLite in its implementation of [sqlite3_malloc()],
3287	** but not overhead added by the any underlying system library
3288	** routines that [sqlite3_malloc()] may call.
3289	**
3290	** ^The memory high-water mark is reset to the current value of
3291	** [sqlite3_memory_used()] if and only if the parameter to
3292	** [sqlite3_memory_highwater()] is true. ^The value returned
	@@ -3734,19 +3734,19 @@
3734	** attempt to use the same database connection at the same time.
3735	** (Mutexes will block any actual concurrency, but in this mode
3736	** there is no harm in trying.)
3737	**
3738	** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
3739	** <dd>The database is opened [shared cache] enabled, overriding
3740	** the default shared cache setting provided by
3741	** [sqlite3_enable_shared_cache()].)^
3742	** The [use of shared cache mode is discouraged] and hence shared cache
3743	** capabilities may be omitted from many builds of SQLite. In such cases,
3744	** this option is a no-op.
3745	**
3746	** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
3747	** <dd>The database is opened [shared cache] disabled, overriding
3748	** the default shared cache setting provided by
3749	** [sqlite3_enable_shared_cache()].)^
3750	**
3751	** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
3752	** <dd>The database connection comes up in "extended result code mode".
	@@ -4077,11 +4077,11 @@
4077	** These interfaces are provided for use by [VFS shim] implementations and
4078	** are not useful outside of that context.
4079	**
4080	** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
4081	** database filename D with corresponding journal file J and WAL file W and
4082	** with N URI parameters key/values pairs in the array P. The result from
4083	** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
4084	** is safe to pass to routines like:
4085	** <ul>
4086	** <li> [sqlite3_uri_parameter()],
4087	** <li> [sqlite3_uri_boolean()],
	@@ -4160,19 +4160,19 @@
4160	** The application does not need to worry about freeing the result.
4161	** However, the error string might be overwritten or deallocated by
4162	** subsequent calls to other SQLite interface functions.)^
4163	**
4164	** ^The sqlite3_errstr(E) interface returns the English-language text
4165	** that describes the [result code] E, as UTF-8, or NULL if E is not an
4166	** result code for which a text error message is available.
4167	** ^(Memory to hold the error message string is managed internally
4168	** and must not be freed by the application)^.
4169	**
4170	** ^If the most recent error references a specific token in the input
4171	** SQL, the sqlite3_error_offset() interface returns the byte offset
4172	** of the start of that token. ^The byte offset returned by
4173	** sqlite3_error_offset() assumes that the input SQL is UTF8.
4174	** ^If the most recent error does not reference a specific token in the input
4175	** SQL, then the sqlite3_error_offset() function returns -1.
4176	**
4177	** When the serialized [threading mode] is in use, it might be the
4178	** case that a second error occurs on a separate thread in between
	@@ -4267,12 +4267,12 @@
4267	** CAPI3REF: Run-Time Limit Categories
4268	** KEYWORDS: {limit category} {*limit categories}
4269	**
4270	** These constants define various performance limits
4271	** that can be lowered at run-time using [sqlite3_limit()].
4272	** The synopsis of the meanings of the various limits is shown below.
4273	** Additional information is available at [limits \| Limits in SQLite].
4274	**
4275	** <dl>
4276	** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
4277	** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
4278	**
	@@ -4333,11 +4333,11 @@
4333	#define SQLITE_LIMIT_WORKER_THREADS 11
4334
4335	/*
4336	** CAPI3REF: Prepare Flags
4337	**
4338	** These constants define various flags that can be passed into
4339	** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
4340	** [sqlite3_prepare16_v3()] interfaces.
4341	**
4342	** New flags may be added in future releases of SQLite.
4343	**
	@@ -4420,11 +4420,11 @@
4420	** statement is generated.
4421	** If the caller knows that the supplied string is nul-terminated, then
4422	** there is a small performance advantage to passing an nByte parameter that
4423	** is the number of bytes in the input string <i>including</i>
4424	** the nul-terminator.
4425	** Note that nByte measure the length of the input in bytes, not
4426	** characters, even for the UTF-16 interfaces.
4427	**
4428	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
4429	** past the end of the first SQL statement in zSql. These routines only
4430	** compile the first statement in zSql, so *pzTail is left pointing to
	@@ -4554,11 +4554,11 @@
4554	** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
4555	** will return "SELECT 2345,NULL".)^
4556	**
4557	** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
4558	** is available to hold the result, or if the result would exceed the
4559	** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
4560	**
4561	** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
4562	** bound parameter expansions. ^The [SQLITE_OMIT_TRACE] compile-time
4563	** option causes sqlite3_expanded_sql() to always return NULL.
4564	**
	@@ -4742,11 +4742,11 @@
4742	/*
4743	** CAPI3REF: SQL Function Context Object
4744	**
4745	** The context in which an SQL function executes is stored in an
4746	** sqlite3_context object. ^A pointer to an sqlite3_context object
4747	** is always first parameter to [application-defined SQL functions].
4748	** The application-defined SQL function implementation will pass this
4749	** pointer through into calls to [sqlite3_result_int \| sqlite3_result()],
4750	** [sqlite3_aggregate_context()], [sqlite3_user_data()],
4751	** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
4752	** and/or [sqlite3_set_auxdata()].
	@@ -4758,11 +4758,11 @@
4758	** KEYWORDS: {host parameter} {host parameters} {host parameter name}
4759	** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
4760	** METHOD: sqlite3_stmt
4761	**
4762	** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
4763	** literals may be replaced by a [parameter] that matches one of following
4764	** templates:
4765	**
4766	** <ul>
4767	** <li> ?
4768	** <li> ?NNN
	@@ -4803,11 +4803,11 @@
4803	** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
4804	** otherwise.
4805	**
4806	** [[byte-order determination rules]] ^The byte-order of
4807	** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
4808	** found in first character, which is removed, or in the absence of a BOM
4809	** the byte order is the native byte order of the host
4810	** machine for sqlite3_bind_text16() or the byte order specified in
4811	** the 6th parameter for sqlite3_bind_text64().)^
4812	** ^If UTF16 input text contains invalid unicode
4813	** characters, then SQLite might change those invalid characters
	@@ -4823,11 +4823,11 @@
4823	** the behavior is undefined.
4824	** If a non-negative fourth parameter is provided to sqlite3_bind_text()
4825	** or sqlite3_bind_text16() or sqlite3_bind_text64() then
4826	** that parameter must be the byte offset
4827	** where the NUL terminator would occur assuming the string were NUL
4828	** terminated. If any NUL characters occurs at byte offsets less than
4829	** the value of the fourth parameter then the resulting string value will
4830	** contain embedded NULs. The result of expressions involving strings
4831	** with embedded NULs is undefined.
4832	**
4833	** ^The fifth argument to the BLOB and string binding interfaces controls
	@@ -5035,11 +5035,11 @@
5035	/*
5036	** CAPI3REF: Source Of Data In A Query Result
5037	** METHOD: sqlite3_stmt
5038	**
5039	** ^These routines provide a means to determine the database, table, and
5040	** table column that is the origin of a particular result column in
5041	** [SELECT] statement.
5042	** ^The name of the database or table or column can be returned as
5043	** either a UTF-8 or UTF-16 string. ^The _database_ routines return
5044	** the database name, the _table_ routines return the table name, and
5045	** the origin_ routines return the column name.
	@@ -5479,11 +5479,11 @@
5479	** CAPI3REF: Destroy A Prepared Statement Object
5480	** DESTRUCTOR: sqlite3_stmt
5481	**
5482	** ^The sqlite3_finalize() function is called to delete a [prepared statement].
5483	** ^If the most recent evaluation of the statement encountered no errors
5484	** or if the statement is never been evaluated, then sqlite3_finalize() returns
5485	** SQLITE_OK. ^If the most recent evaluation of statement S failed, then
5486	** sqlite3_finalize(S) returns the appropriate [error code] or
5487	** [extended error code].
5488	**
5489	** ^The sqlite3_finalize(S) routine can be called at any point during
	@@ -5604,12 +5604,12 @@
5604	** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
5605	** index expressions, or the WHERE clause of partial indexes.
5606	**
5607	** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
5608	** all application-defined SQL functions that do not need to be
5609	** used inside of triggers, view, CHECK constraints, or other elements of
5610	** the database schema. This flags is especially recommended for SQL
5611	** functions that have side effects or reveal internal application state.
5612	** Without this flag, an attacker might be able to modify the schema of
5613	** a database file to include invocations of the function with parameters
5614	** chosen by the attacker, which the application will then execute when
5615	** the database file is opened and read.
	@@ -5636,11 +5636,11 @@
5636	** or aggregate window function. More details regarding the implementation
5637	** of aggregate window functions are
5638	** [user-defined window functions\|available here].
5639	**
5640	** ^(If the final parameter to sqlite3_create_function_v2() or
5641	** sqlite3_create_window_function() is not NULL, then it is destructor for
5642	** the application data pointer. The destructor is invoked when the function
5643	** is deleted, either by being overloaded or when the database connection
5644	** closes.)^ ^The destructor is also invoked if the call to
5645	** sqlite3_create_function_v2() fails. ^When the destructor callback is
5646	** invoked, it is passed a single argument which is a copy of the application
	@@ -5711,11 +5711,11 @@
5711	);
5712
5713	/*
5714	** CAPI3REF: Text Encodings
5715	**
5716	** These constant define integer codes that represent the various
5717	** text encodings supported by SQLite.
5718	*/
5719	#define SQLITE_UTF8 1 /* IMP: R-37514-35566 */
5720	#define SQLITE_UTF16LE 2 /* IMP: R-03371-37637 */
5721	#define SQLITE_UTF16BE 3 /* IMP: R-51971-34154 */
	@@ -5803,11 +5803,11 @@
5803	** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
5804	** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
5805	** result.
5806	** Every function that invokes [sqlite3_result_subtype()] should have this
5807	** property. If it does not, then the call to [sqlite3_result_subtype()]
5808	** might become a no-op if the function is used as term in an
5809	** [expression index]. On the other hand, SQL functions that never invoke
5810	** [sqlite3_result_subtype()] should avoid setting this property, as the
5811	** purpose of this property is to disable certain optimizations that are
5812	** incompatible with subtypes.
5813	**
	@@ -5930,11 +5930,11 @@
5930	**
5931	** ^Within the [xUpdate] method of a [virtual table], the
5932	** sqlite3_value_nochange(X) interface returns true if and only if
5933	** the column corresponding to X is unchanged by the UPDATE operation
5934	** that the xUpdate method call was invoked to implement and if
5935	** and the prior [xColumn] method call that was invoked to extracted
5936	** the value for that column returned without setting a result (probably
5937	** because it queried [sqlite3_vtab_nochange()] and found that the column
5938	** was unchanging). ^Within an [xUpdate] method, any value for which
5939	** sqlite3_value_nochange(X) is true will in all other respects appear
5940	** to be a NULL value. If sqlite3_value_nochange(X) is invoked anywhere other
	@@ -6036,11 +6036,11 @@
6036	/*
6037	** CAPI3REF: Copy And Free SQL Values
6038	** METHOD: sqlite3_value
6039	**
6040	** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
6041	** object D and returns a pointer to that copy. ^The [sqlite3_value] returned
6042	** is a [protected sqlite3_value] object even if the input is not.
6043	** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
6044	** memory allocation fails. ^If V is a [pointer value], then the result
6045	** of sqlite3_value_dup(V) is a NULL value.
6046	**
	@@ -6074,11 +6074,11 @@
6074	** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
6075	** when first called if N is less than or equal to zero or if a memory
6076	** allocation error occurs.
6077	**
6078	** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
6079	** determined by the N parameter on first successful call. Changing the
6080	** value of N in any subsequent call to sqlite3_aggregate_context() within
6081	** the same aggregate function instance will not resize the memory
6082	** allocation.)^ Within the xFinal callback, it is customary to set
6083	** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
6084	** pointless memory allocations occur.
	@@ -6236,11 +6236,11 @@
6236	** of as a secret key such that only code that knows the secret key is able
6237	** to access the associated data.
6238	**
6239	** Security Warning: These interfaces should not be exposed in scripting
6240	** languages or in other circumstances where it might be possible for an
6241	** an attacker to invoke them. Any agent that can invoke these interfaces
6242	** can probably also take control of the process.
6243	**
6244	** Database connection client data is only available for SQLite
6245	** version 3.44.0 ([dateof:3.44.0]) and later.
6246	**
	@@ -6350,11 +6350,11 @@
6350	** ^If the 3rd parameter to the sqlite3_result_text* interfaces
6351	** is non-negative, then as many bytes (not characters) of the text
6352	** pointed to by the 2nd parameter are taken as the application-defined
6353	** function result. If the 3rd parameter is non-negative, then it
6354	** must be the byte offset into the string where the NUL terminator would
6355	** appear if the string where NUL terminated. If any NUL characters occur
6356	** in the string at a byte offset that is less than the value of the 3rd
6357	** parameter, then the resulting string will contain embedded NULs and the
6358	** result of expressions operating on strings with embedded NULs is undefined.
6359	** ^If the 4th parameter to the sqlite3_result_text* interfaces
6360	** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
	@@ -6408,11 +6408,11 @@
6408	** for the P parameter. ^SQLite invokes D with P as its only argument
6409	** when SQLite is finished with P. The T parameter should be a static
6410	** string and preferably a string literal. The sqlite3_result_pointer()
6411	** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
6412	**
6413	** If these routines are called from within the different thread
6414	** than the one containing the application-defined function that received
6415	** the [sqlite3_context] pointer, the results are undefined.
6416	*/
6417	SQLITE_API void sqlite3_result_blob(sqlite3_context, const void, int, void()(void));
6418	SQLITE_API void sqlite3_result_blob64(sqlite3_context,const void,
	@@ -6814,11 +6814,11 @@
6814	/*
6815	** CAPI3REF: Return The Schema Name For A Database Connection
6816	** METHOD: sqlite3
6817	**
6818	** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
6819	** for the N-th database on database connection D, or a NULL pointer of N is
6820	** out of range. An N value of 0 means the main database file. An N of 1 is
6821	** the "temp" schema. Larger values of N correspond to various ATTACH-ed
6822	** databases.
6823	**
6824	** Space to hold the string that is returned by sqlite3_db_name() is managed
	@@ -6909,20 +6909,20 @@
6909	**
6910	** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
6911	** <dd>The SQLITE_TXN_READ state means that the database is currently
6912	** in a read transaction. Content has been read from the database file
6913	** but nothing in the database file has changed. The transaction state
6914	** will advanced to SQLITE_TXN_WRITE if any changes occur and there are
6915	** no other conflicting concurrent write transactions. The transaction
6916	** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
6917	** [COMMIT].</dd>
6918	**
6919	** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
6920	** <dd>The SQLITE_TXN_WRITE state means that the database is currently
6921	** in a write transaction. Content has been written to the database file
6922	** but has not yet committed. The transaction state will change to
6923	** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
6924	*/
6925	#define SQLITE_TXN_NONE 0
6926	#define SQLITE_TXN_READ 1
6927	#define SQLITE_TXN_WRITE 2
6928
	@@ -7199,11 +7199,11 @@
7199
7200	/*
7201	** CAPI3REF: Impose A Limit On Heap Size
7202	**
7203	** These interfaces impose limits on the amount of heap memory that will be
7204	** by all database connections within a single process.
7205	**
7206	** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
7207	** soft limit on the amount of heap memory that may be allocated by SQLite.
7208	** ^SQLite strives to keep heap memory utilization below the soft heap
7209	** limit by reducing the number of pages held in the page cache
	@@ -7257,11 +7257,11 @@
7257	** by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
7258	** from the heap.
7259	** </ul>)^
7260	**
7261	** The circumstances under which SQLite will enforce the heap limits may
7262	** changes in future releases of SQLite.
7263	*/
7264	SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
7265	SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
7266
7267	/*
	@@ -7372,12 +7372,12 @@
7372	** be tried also.
7373	**
7374	** ^The entry point is zProc.
7375	** ^(zProc may be 0, in which case SQLite will try to come up with an
7376	** entry point name on its own. It first tries "sqlite3_extension_init".
7377	** If that does not work, it constructs a name "sqlite3_X_init" where the
7378	** X is consists of the lower-case equivalent of all ASCII alphabetic
7379	** characters in the filename from the last "/" to the first following
7380	** "." and omitting any initial "lib".)^
7381	** ^The sqlite3_load_extension() interface returns
7382	** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
7383	** ^If an error occurs and pzErrMsg is not 0, then the
	@@ -7444,11 +7444,11 @@
7444	** that is to be automatically loaded into all new database connections.
7445	**
7446	** ^(Even though the function prototype shows that xEntryPoint() takes
7447	** no arguments and returns void, SQLite invokes xEntryPoint() with three
7448	** arguments and expects an integer result as if the signature of the
7449	** entry point where as follows:
7450	**
7451	** <blockquote><pre>
7452	**   int xEntryPoint(
7453	**   sqlite3 *db,
7454	const char pzErrMsg,
	@@ -7608,11 +7608,11 @@
7608	** and becomes the argvIndex-th entry in argv. ^(If aConstraintUsage[].omit
7609	** is true, then the constraint is assumed to be fully handled by the
7610	** virtual table and might not be checked again by the byte code.)^ ^(The
7611	** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
7612	** is left in its default setting of false, the constraint will always be
7613	** checked separately in byte code. If the omit flag is change to true, then
7614	** the constraint may or may not be checked in byte code. In other words,
7615	** when the omit flag is true there is no guarantee that the constraint will
7616	** not be checked again using byte code.)^
7617	**
7618	** ^The idxNum and idxStr values are recorded and passed into the
	@@ -7634,11 +7634,11 @@
7634	** will be returned by the strategy.
7635	**
7636	** The xBestIndex method may optionally populate the idxFlags field with a
7637	** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
7638	** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
7639	** output to show the idxNum has hex instead of as decimal. Another flag is
7640	** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
7641	** return at most one row.
7642	**
7643	** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
7644	** SQLite also assumes that if a call to the xUpdate() method is made as
	@@ -7775,11 +7775,11 @@
7775	** by the first parameter. ^The name of the module is given by the
7776	** second parameter. ^The third parameter is a pointer to
7777	** the implementation of the [virtual table module]. ^The fourth
7778	** parameter is an arbitrary client data pointer that is passed through
7779	** into the [xCreate] and [xConnect] methods of the virtual table module
7780	** when a new virtual table is be being created or reinitialized.
7781	**
7782	** ^The sqlite3_create_module_v2() interface has a fifth parameter which
7783	** is a pointer to a destructor for the pClientData. ^SQLite will
7784	** invoke the destructor function (if it is not NULL) when SQLite
7785	** no longer needs the pClientData pointer. ^The destructor will also
	@@ -7940,11 +7940,11 @@
7940	**
7941	** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
7942	** in *ppBlob. Otherwise an [error code] is returned and, unless the error
7943	** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
7944	** the API is not misused, it is always safe to call [sqlite3_blob_close()]
7945	** on *ppBlob after this function it returns.
7946	**
7947	** This function fails with SQLITE_ERROR if any of the following are true:
7948	** <ul>
7949	** <li> ^(Database zDb does not exist)^,
7950	** <li> ^(Table zTable does not exist within database zDb)^,
	@@ -8060,11 +8060,11 @@
8060	** CAPI3REF: Return The Size Of An Open BLOB
8061	** METHOD: sqlite3_blob
8062	**
8063	** ^Returns the size in bytes of the BLOB accessible via the
8064	** successfully opened [BLOB handle] in its only argument. ^The
8065	** incremental blob I/O routines can only read or overwriting existing
8066	** blob content; they cannot change the size of a blob.
8067	**
8068	** This routine only works on a [BLOB handle] which has been created
8069	** by a prior successful call to [sqlite3_blob_open()] and which has not
8070	** been closed by [sqlite3_blob_close()]. Passing any other pointer in
	@@ -8210,11 +8210,11 @@
8210	** function that calls sqlite3_initialize().
8211	**
8212	** ^The sqlite3_mutex_alloc() routine allocates a new
8213	** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
8214	** routine returns NULL if it is unable to allocate the requested
8215	** mutex. The argument to sqlite3_mutex_alloc() must one of these
8216	** integer constants:
8217	**
8218	** <ul>
8219	** <li> SQLITE_MUTEX_FAST
8220	** <li> SQLITE_MUTEX_RECURSIVE
	@@ -8443,11 +8443,11 @@
8443
8444	/*
8445	** CAPI3REF: Retrieve the mutex for a database connection
8446	** METHOD: sqlite3
8447	**
8448	** ^This interface returns a pointer the [sqlite3_mutex] object that
8449	** serializes access to the [database connection] given in the argument
8450	** when the [threading mode] is Serialized.
8451	** ^If the [threading mode] is Single-thread or Multi-thread then this
8452	** routine returns a NULL pointer.
8453	*/
	@@ -8566,11 +8566,11 @@
8566
8567	/*
8568	** CAPI3REF: SQL Keyword Checking
8569	**
8570	** These routines provide access to the set of SQL language keywords
8571	** recognized by SQLite. Applications can uses these routines to determine
8572	** whether or not a specific identifier needs to be escaped (for example,
8573	** by enclosing in double-quotes) so as not to confuse the parser.
8574	**
8575	** The sqlite3_keyword_count() interface returns the number of distinct
8576	** keywords understood by SQLite.
	@@ -8734,11 +8734,11 @@
8734	**
8735	** ^The [sqlite3_str_value(X)] method returns a pointer to the current
8736	** content of the dynamic string under construction in X. The value
8737	** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
8738	** and might be freed or altered by any subsequent method on the same
8739	** [sqlite3_str] object. Applications must not used the pointer returned
8740	** [sqlite3_str_value(X)] after any subsequent method call on the same
8741	** object. ^Applications may change the content of the string returned
8742	** by [sqlite3_str_value(X)] as long as they do not write into any bytes
8743	** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
8744	** write any byte after any subsequent sqlite3_str method call.
	@@ -8820,11 +8820,11 @@
8820	** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
8821	** <dd>This parameter returns the number of bytes of page cache
8822	** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
8823	** buffer and where forced to overflow to [sqlite3_malloc()]. The
8824	** returned value includes allocations that overflowed because they
8825	** where too large (they were larger than the "sz" parameter to
8826	** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
8827	** no space was left in the page cache.</dd>)^
8828	**
8829	** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
8830	** <dd>This parameter records the largest memory allocation request
	@@ -8904,53 +8904,55 @@
8904	** checked out.</dd>)^
8905	**
8906	** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
8907	** <dd>This parameter returns the number of malloc attempts that were
8908	** satisfied using lookaside memory. Only the high-water value is meaningful;
8909	** the current value is always zero.)^
8910	**
8911	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
8912	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
8913	** <dd>This parameter returns the number malloc attempts that might have
8914	** been satisfied using lookaside memory but failed due to the amount of
8915	** memory requested being larger than the lookaside slot size.
8916	** Only the high-water value is meaningful;
8917	** the current value is always zero.)^
8918	**
8919	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
8920	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
8921	** <dd>This parameter returns the number malloc attempts that might have
8922	** been satisfied using lookaside memory but failed due to all lookaside
8923	** memory already being in use.
8924	** Only the high-water value is meaningful;
8925	** the current value is always zero.)^
8926	**
8927	** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
8928	** <dd>This parameter returns the approximate number of bytes of heap
8929	** memory used by all pager caches associated with the database connection.)^
8930	** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.

8931	**
8932	** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
8933	** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
8934	** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
8935	** pager cache is shared between two or more connections the bytes of heap
8936	** memory used by that pager cache is divided evenly between the attached
8937	** connections.)^ In other words, if none of the pager caches associated
8938	** with the database connection are shared, this request returns the same
8939	** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are
8940	** shared, the value returned by this call will be smaller than that returned
8941	** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
8942	** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.
8943	**
8944	** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
8945	** <dd>This parameter returns the approximate number of bytes of heap
8946	** memory used to store the schema for all databases associated
8947	** with the connection - main, temp, and any [ATTACH]-ed databases.)^
8948	** ^The full amount of memory used by the schemas is reported, even if the
8949	** schema memory is shared with other database connections due to
8950	** [shared cache mode] being enabled.
8951	** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.

8952	**
8953	** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
8954	** <dd>This parameter returns the approximate number of bytes of heap
8955	** and lookaside memory used by all prepared statements associated with
8956	** the database connection.)^
	@@ -8983,11 +8985,11 @@
8983	** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
8984	** <dd>This parameter returns the number of dirty cache entries that have
8985	** been written to disk in the middle of a transaction due to the page
8986	** cache overflowing. Transactions are more efficient if they are written
8987	** to disk all at once. When pages spill mid-transaction, that introduces
8988	** additional overhead. This parameter can be used help identify
8989	** inefficiencies that can be resolved by increasing the cache size.
8990	** </dd>
8991	**
8992	** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
8993	** <dd>This parameter returns zero for the current value if and only if
	@@ -9054,48 +9056,48 @@
9054	** careful use of indices.</dd>
9055	**
9056	** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
9057	** <dd>^This is the number of sort operations that have occurred.
9058	** A non-zero value in this counter may indicate an opportunity to
9059	** improvement performance through careful use of indices.</dd>
9060	**
9061	** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
9062	** <dd>^This is the number of rows inserted into transient indices that
9063	** were created automatically in order to help joins run faster.
9064	** A non-zero value in this counter may indicate an opportunity to
9065	** improvement performance by adding permanent indices that do not
9066	** need to be reinitialized each time the statement is run.</dd>
9067	**
9068	** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
9069	** <dd>^This is the number of virtual machine operations executed
9070	** by the prepared statement if that number is less than or equal
9071	** to 2147483647. The number of virtual machine operations can be
9072	** used as a proxy for the total work done by the prepared statement.
9073	** If the number of virtual machine operations exceeds 2147483647
9074	** then the value returned by this statement status code is undefined.
9075	**
9076	** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
9077	** <dd>^This is the number of times that the prepare statement has been
9078	** automatically regenerated due to schema changes or changes to
9079	** [bound parameters] that might affect the query plan.
9080	**
9081	** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
9082	** <dd>^This is the number of times that the prepared statement has
9083	** been run. A single "run" for the purposes of this counter is one
9084	** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
9085	** The counter is incremented on the first [sqlite3_step()] call of each
9086	** cycle.
9087	**
9088	** [[SQLITE_STMTSTATUS_FILTER_MISS]]
9089	** [[SQLITE_STMTSTATUS_FILTER HIT]]
9090	** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
9091	** SQLITE_STMTSTATUS_FILTER_MISS</dt>
9092	** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
9093	** step was bypassed because a Bloom filter returned not-found. The
9094	** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
9095	** times that the Bloom filter returned a find, and thus the join step
9096	** had to be processed as normal.
9097	**
9098	** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
9099	** <dd>^This is the approximate number of bytes of heap memory
9100	** used to store the prepared statement. ^This value is not actually
9101	** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
	@@ -9196,31 +9198,31 @@
9196	** [[the xCreate() page cache methods]]
9197	** ^SQLite invokes the xCreate() method to construct a new cache instance.
9198	** SQLite will typically create one cache instance for each open database file,
9199	** though this is not guaranteed. ^The
9200	** first parameter, szPage, is the size in bytes of the pages that must
9201	** be allocated by the cache. ^szPage will always a power of two. ^The
9202	** second parameter szExtra is a number of bytes of extra storage
9203	** associated with each page cache entry. ^The szExtra parameter will
9204	** a number less than 250. SQLite will use the
9205	** extra szExtra bytes on each page to store metadata about the underlying
9206	** database page on disk. The value passed into szExtra depends
9207	** on the SQLite version, the target platform, and how SQLite was compiled.
9208	** ^The third argument to xCreate(), bPurgeable, is true if the cache being
9209	** created will be used to cache database pages of a file stored on disk, or
9210	** false if it is used for an in-memory database. The cache implementation
9211	** does not have to do anything special based with the value of bPurgeable;
9212	** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
9213	** never invoke xUnpin() except to deliberately delete a page.
9214	** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
9215	** false will always have the "discard" flag set to true.
9216	** ^Hence, a cache created with bPurgeable false will
9217	** never contain any unpinned pages.
9218	**
9219	** [[the xCachesize() page cache method]]
9220	** ^(The xCachesize() method may be called at any time by SQLite to set the
9221	** suggested maximum cache-size (number of pages stored by) the cache
9222	** instance passed as the first argument. This is the value configured using
9223	** the SQLite "[PRAGMA cache_size]" command.)^ As with the bPurgeable
9224	** parameter, the implementation is not required to do anything with this
9225	** value; it is advisory only.
9226	**
	@@ -9243,16 +9245,16 @@
9243	**
9244	** If the requested page is already in the page cache, then the page cache
9245	** implementation must return a pointer to the page buffer with its content
9246	** intact. If the requested page is not already in the cache, then the
9247	** cache implementation should use the value of the createFlag
9248	** parameter to help it determined what action to take:
9249	**
9250	** <table border=1 width=85% align=center>
9251	** <tr><th> createFlag <th> Behavior when page is not already in cache
9252	** <tr><td> 0 <td> Do not allocate a new page. Return NULL.
9253	** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
9254	** Otherwise return NULL.
9255	** <tr><td> 2 <td> Make every effort to allocate a new page. Only return
9256	** NULL if allocating a new page is effectively impossible.
9257	** </table>
9258	**
	@@ -9265,11 +9267,11 @@
9265	** [[the xUnpin() page cache method]]
9266	** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
9267	** as its second argument. If the third parameter, discard, is non-zero,
9268	** then the page must be evicted from the cache.
9269	** ^If the discard parameter is
9270	** zero, then the page may be discarded or retained at the discretion of
9271	** page cache implementation. ^The page cache implementation
9272	** may choose to evict unpinned pages at any time.
9273	**
9274	** The cache must not perform any reference counting. A single
9275	** call to xUnpin() unpins the page regardless of the number of prior calls
	@@ -9283,11 +9285,11 @@
9283	** to be pinned.
9284	**
9285	** When SQLite calls the xTruncate() method, the cache must discard all
9286	** existing cache entries with page numbers (keys) greater than or equal
9287	** to the value of the iLimit parameter passed to xTruncate(). If any
9288	** of these pages are pinned, they are implicitly unpinned, meaning that
9289	** they can be safely discarded.
9290	**
9291	** [[the xDestroy() page cache method]]
9292	** ^The xDestroy() method is used to delete a cache allocated by xCreate().
9293	** All resources associated with the specified cache should be freed. ^After
	@@ -9463,11 +9465,11 @@
9463	** sqlite3_backup_step(), the source database may be modified mid-way
9464	** through the backup process. ^If the source database is modified by an
9465	** external process or via a database connection other than the one being
9466	** used by the backup operation, then the backup will be automatically
9467	** restarted by the next call to sqlite3_backup_step(). ^If the source
9468	** database is modified by the using the same database connection as is used
9469	** by the backup operation, then the backup database is automatically
9470	** updated at the same time.
9471	**
9472	** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
9473	**
	@@ -9480,11 +9482,11 @@
9480	** active write-transaction on the destination database is rolled back.
9481	** The [sqlite3_backup] object is invalid
9482	** and may not be used following a call to sqlite3_backup_finish().
9483	**
9484	** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
9485	** sqlite3_backup_step() errors occurred, regardless or whether or not
9486	** sqlite3_backup_step() completed.
9487	** ^If an out-of-memory condition or IO error occurred during any prior
9488	** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
9489	** sqlite3_backup_finish() returns the corresponding [error code].
9490	**
	@@ -9582,11 +9584,11 @@
9582	** identity of the database connection (the blocking connection) that
9583	** has locked the required resource is stored internally. ^After an
9584	** application receives an SQLITE_LOCKED error, it may call the
9585	** sqlite3_unlock_notify() method with the blocked connection handle as
9586	** the first argument to register for a callback that will be invoked
9587	** when the blocking connections current transaction is concluded. ^The
9588	** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
9589	** call that concludes the blocking connection's transaction.
9590	**
9591	** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
9592	** there is a chance that the blocking connection will have already
	@@ -9602,11 +9604,11 @@
9602	** ^(There may be at most one unlock-notify callback registered by a
9603	** blocked connection. If sqlite3_unlock_notify() is called when the
9604	** blocked connection already has a registered unlock-notify callback,
9605	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
9606	** called with a NULL pointer as its second argument, then any existing
9607	** unlock-notify callback is canceled. ^The blocked connections
9608	** unlock-notify callback may also be canceled by closing the blocked
9609	** connection using [sqlite3_close()].
9610	**
9611	** The unlock-notify callback is not reentrant. If an application invokes
9612	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -10000,11 +10002,11 @@
10000	** where X is an integer. If X is zero, then the [virtual table] whose
10001	** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
10002	** support constraints. In this configuration (which is the default) if
10003	** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
10004	** statement is rolled back as if [ON CONFLICT \| OR ABORT] had been
10005	** specified as part of the users SQL statement, regardless of the actual
10006	** ON CONFLICT mode specified.
10007	**
10008	** If X is non-zero, then the virtual table implementation guarantees
10009	** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
10010	** any modifications to internal or persistent data structures have been made.
	@@ -10034,11 +10036,11 @@
10034	** </dd>
10035	**
10036	** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
10037	** <dd>Calls of the form
10038	** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
10039	** the [xConnect] or [xCreate] methods of a [virtual table] implementation
10040	** identify that virtual table as being safe to use from within triggers
10041	** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
10042	** virtual table can do no serious harm even if it is controlled by a
10043	** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
10044	** flag unless absolutely necessary.
	@@ -10202,21 +10204,21 @@
10202	** <tr><td>2<td>no<td>yes<td>yes
10203	** <tr><td>3<td>yes<td>yes<td>yes
10204	** </table>
10205	**
10206	** ^For the purposes of comparing virtual table output values to see if the
10207	** values are same value for sorting purposes, two NULL values are considered
10208	** to be the same. In other words, the comparison operator is "IS"
10209	** (or "IS NOT DISTINCT FROM") and not "==".
10210	**
10211	** If a virtual table implementation is unable to meet the requirements
10212	** specified above, then it must not set the "orderByConsumed" flag in the
10213	** [sqlite3_index_info] object or an incorrect answer may result.
10214	**
10215	** ^A virtual table implementation is always free to return rows in any order
10216	** it wants, as long as the "orderByConsumed" flag is not set. ^When the
10217	** the "orderByConsumed" flag is unset, the query planner will add extra
10218	** [bytecode] to ensure that the final results returned by the SQL query are
10219	** ordered correctly. The use of the "orderByConsumed" flag and the
10220	** sqlite3_vtab_distinct() interface is merely an optimization. ^Careful
10221	** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
10222	** flag might help queries against a virtual table to run faster. Being
	@@ -10309,11 +10311,11 @@
10309	**
10310	** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
10311	** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
10312	** xFilter method which invokes these routines, and specifically
10313	** a parameter that was previously selected for all-at-once IN constraint
10314	** processing use the [sqlite3_vtab_in()] interface in the
10315	** [xBestIndex\|xBestIndex method]. ^(If the X parameter is not
10316	** an xFilter argument that was selected for all-at-once IN constraint
10317	** processing, then these routines return [SQLITE_ERROR].)^
10318	**
10319	** ^(Use these routines to access all values on the right-hand side
	@@ -10364,11 +10366,11 @@
10364	** right-hand operand is not known, then *V is set to a NULL pointer.
10365	** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
10366	** and only if *V is set to a value. ^The sqlite3_vtab_rhs_value(P,J,V)
10367	** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
10368	** constraint is not available. ^The sqlite3_vtab_rhs_value() interface
10369	** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
10370	** something goes wrong.
10371	**
10372	** The sqlite3_vtab_rhs_value() interface is usually only successful if
10373	** the right-hand operand of a constraint is a literal value in the original
10374	** SQL statement. If the right-hand operand is an expression or a reference
	@@ -10392,12 +10394,12 @@
10392	/*
10393	** CAPI3REF: Conflict resolution modes
10394	** KEYWORDS: {conflict resolution mode}
10395	**
10396	** These constants are returned by [sqlite3_vtab_on_conflict()] to
10397	** inform a [virtual table] implementation what the [ON CONFLICT] mode
10398	** is for the SQL statement being evaluated.
10399	**
10400	** Note that the [SQLITE_IGNORE] constant is also used as a potential
10401	** return value from the [sqlite3_set_authorizer()] callback and that
10402	** [SQLITE_ABORT] is also a [result code].
10403	*/
	@@ -10433,43 +10435,43 @@
10433	** to the total number of rows examined by all iterations of the X-th loop.</dd>
10434	**
10435	** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
10436	** <dd>^The "double" variable pointed to by the V parameter will be set to the
10437	** query planner's estimate for the average number of rows output from each
10438	** iteration of the X-th loop. If the query planner's estimates was accurate,
10439	** then this value will approximate the quotient NVISIT/NLOOP and the
10440	** product of this value for all prior loops with the same SELECTID will
10441	** be the NLOOP value for the current loop.
10442	**
10443	** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
10444	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10445	** to a zero-terminated UTF-8 string containing the name of the index or table
10446	** used for the X-th loop.
10447	**
10448	** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
10449	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10450	** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
10451	** description for the X-th loop.
10452	**
10453	** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
10454	** <dd>^The "int" variable pointed to by the V parameter will be set to the
10455	** id for the X-th query plan element. The id value is unique within the
10456	** statement. The select-id is the same value as is output in the first
10457	** column of an [EXPLAIN QUERY PLAN] query.
10458	**
10459	** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
10460	** <dd>The "int" variable pointed to by the V parameter will be set to the
10461	** the id of the parent of the current query element, if applicable, or
10462	** to zero if the query element has no parent. This is the same value as
10463	** returned in the second column of an [EXPLAIN QUERY PLAN] query.
10464	**
10465	** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
10466	** <dd>The sqlite3_int64 output value is set to the number of cycles,
10467	** according to the processor time-stamp counter, that elapsed while the
10468	** query element was being processed. This value is not available for
10469	** all query elements - if it is unavailable the output variable is
10470	** set to -1.
10471	** </dl>
10472	*/
10473	#define SQLITE_SCANSTAT_NLOOP 0
10474	#define SQLITE_SCANSTAT_NVISIT 1
10475	#define SQLITE_SCANSTAT_EST 2
	@@ -10506,12 +10508,12 @@
10506	** the EXPLAIN QUERY PLAN output) are available. Invoking API
10507	** sqlite3_stmt_scanstatus() is equivalent to calling
10508	** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
10509	**
10510	** Parameter "idx" identifies the specific query element to retrieve statistics
10511	** for. Query elements are numbered starting from zero. A value of -1 may be
10512	** to query for statistics regarding the entire query. ^If idx is out of range
10513	** - less than -1 or greater than or equal to the total number of query
10514	** elements used to implement the statement - a non-zero value is returned and
10515	** the variable that pOut points to is unchanged.
10516	**
10517	** See also: [sqlite3_stmt_scanstatus_reset()]
	@@ -10550,11 +10552,11 @@
10550	/*
10551	** CAPI3REF: Flush caches to disk mid-transaction
10552	** METHOD: sqlite3
10553	**
10554	** ^If a write-transaction is open on [database connection] D when the
10555	** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
10556	** pages in the pager-cache that are not currently in use are written out
10557	** to disk. A dirty page may be in use if a database cursor created by an
10558	** active SQL statement is reading from it, or if it is page 1 of a database
10559	** file (page 1 is always "in use"). ^The [sqlite3_db_cacheflush(D)]
10560	** interface flushes caches for all schemas - "main", "temp", and
	@@ -10664,12 +10666,12 @@
10664	** operation; or 1 for inserts, updates, or deletes invoked by top-level
10665	** triggers; or 2 for changes resulting from triggers called by top-level
10666	** triggers; and so forth.
10667	**
10668	** When the [sqlite3_blob_write()] API is used to update a blob column,
10669	** the pre-update hook is invoked with SQLITE_DELETE. This is because the
10670	** in this case the new values are not available. In this case, when a
10671	** callback made with op==SQLITE_DELETE is actually a write using the
10672	** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
10673	** the index of the column being written. In other cases, where the
10674	** pre-update hook is being invoked for some other reason, including a
10675	** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
	@@ -10918,20 +10920,20 @@
10918	** is written into *P.
10919	**
10920	** For an ordinary on-disk database file, the serialization is just a
10921	** copy of the disk file. For an in-memory database or a "TEMP" database,
10922	** the serialization is the same sequence of bytes which would be written
10923	** to disk if that database where backed up to disk.
10924	**
10925	** The usual case is that sqlite3_serialize() copies the serialization of
10926	** the database into memory obtained from [sqlite3_malloc64()] and returns
10927	** a pointer to that memory. The caller is responsible for freeing the
10928	** returned value to avoid a memory leak. However, if the F argument
10929	** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
10930	** are made, and the sqlite3_serialize() function will return a pointer
10931	** to the contiguous memory representation of the database that SQLite
10932	** is currently using for that database, or NULL if the no such contiguous
10933	** memory representation of the database exists. A contiguous memory
10934	** representation of the database will usually only exist if there has
10935	** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
10936	** values of D and S.
10937	** The size of the database is written into *P even if the
	@@ -10998,11 +11000,11 @@
10998	**
10999	** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
11000	** database is currently in a read transaction or is involved in a backup
11001	** operation.
11002	**
11003	** It is not possible to deserialized into the TEMP database. If the
11004	** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
11005	** function returns SQLITE_ERROR.
11006	**
11007	** The deserialized database should not be in [WAL mode]. If the database
11008	** is in WAL mode, then any attempt to use the database file will result
	@@ -11020,19 +11022,19 @@
11020	*/
11021	SQLITE_API int sqlite3_deserialize(
11022	sqlite3 db, / The database connection */
11023	const char zSchema, / Which DB to reopen with the deserialization */
11024	unsigned char pData, / The serialized database content */
11025	sqlite3_int64 szDb, /* Number bytes in the deserialization */
11026	sqlite3_int64 szBuf, /* Total size of buffer pData[] */
11027	unsigned mFlags /* Zero or more SQLITE_DESERIALIZE_* flags */
11028	);
11029
11030	/*
11031	** CAPI3REF: Flags for sqlite3_deserialize()
11032	**
11033	** The following are allowed values for 6th argument (the F argument) to
11034	** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
11035	**
11036	** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
11037	** in the P argument is held in memory obtained from [sqlite3_malloc64()]
11038	** and that SQLite should take ownership of this memory and automatically
	@@ -11553,13 +11555,14 @@
11553	** This may appear to have some counter-intuitive effects if a single row
11554	** is written to more than once during a session. For example, if a row
11555	** is inserted while a session object is enabled, then later deleted while
11556	** the same session object is disabled, no INSERT record will appear in the
11557	** changeset, even though the delete took place while the session was disabled.
11558	** Or, if one field of a row is updated while a session is disabled, and
11559	** another field of the same row is updated while the session is enabled, the
11560	** resulting changeset will contain an UPDATE change that updates both fields.

11561	*/
11562	SQLITE_API int sqlite3session_changeset(
11563	sqlite3_session pSession, / Session object */
11564	int pnChangeset, / OUT: Size of buffer at ppChangeset /
11565	void *ppChangeset / OUT: Buffer containing changeset */
	@@ -11764,11 +11767,11 @@
11764	** CAPI3REF: Flags for sqlite3changeset_start_v2
11765	**
11766	** The following flags may passed via the 4th parameter to
11767	** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
11768	**
11769	** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
11770	** Invert the changeset while iterating through it. This is equivalent to
11771	** inverting a changeset using sqlite3changeset_invert() before applying it.
11772	** It is an error to specify this flag with a patchset.
11773	*/
11774	#define SQLITE_CHANGESETSTART_INVERT 0x0002
	@@ -12309,17 +12312,26 @@
12309	** Apply a changeset or patchset to a database. These functions attempt to
12310	** update the "main" database attached to handle db with the changes found in
12311	** the changeset passed via the second and third arguments.
12312	**
12313	** The fourth argument (xFilter) passed to these functions is the "filter
12314	** callback". If it is not NULL, then for each table affected by at least one
12315	** change in the changeset, the filter callback is invoked with
12316	** the table name as the second argument, and a copy of the context pointer
12317	** passed as the sixth argument as the first. If the "filter callback"
12318	** returns zero, then no attempt is made to apply any changes to the table.
12319	** Otherwise, if the return value is non-zero or the xFilter argument to
12320	** is NULL, all changes related to the table are attempted.









12321	**
12322	** For each table that is not excluded by the filter callback, this function
12323	** tests that the target database contains a compatible table. A table is
12324	** considered compatible if all of the following are true:
12325	**
	@@ -12336,15 +12348,15 @@
12336	** changes associated with the table are applied. A warning message is issued
12337	** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
12338	** one such warning is issued for each table in the changeset.
12339	**
12340	** For each change for which there is a compatible table, an attempt is made
12341	** to modify the table contents according to the UPDATE, INSERT or DELETE
12342	** change. If a change cannot be applied cleanly, the conflict handler
12343	** function passed as the fifth argument to sqlite3changeset_apply() may be
12344	** invoked. A description of exactly when the conflict handler is invoked for
12345	** each type of change is below.
12346	**
12347	** Unlike the xFilter argument, xConflict may not be passed NULL. The results
12348	** of passing anything other than a valid function pointer as the xConflict
12349	** argument are undefined.
12350	**
	@@ -12482,10 +12494,27 @@
12482	void pChangeset, / Changeset blob */
12483	int(*xFilter)(
12484	void pCtx, / Copy of sixth arg to _apply() */
12485	const char zTab / Table name */
12486	),

















12487	int(*xConflict)(
12488	void pCtx, / Copy of sixth arg to _apply() */
12489	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12490	sqlite3_changeset_iter p / Handle describing change and conflict */
12491	),
	@@ -12901,10 +12930,27 @@
12901	void pIn, / First arg for xInput */
12902	int(*xFilter)(
12903	void pCtx, / Copy of sixth arg to _apply() */
12904	const char zTab / Table name */
12905	),

















12906	int(*xConflict)(
12907	void pCtx, / Copy of sixth arg to _apply() */
12908	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12909	sqlite3_changeset_iter p / Handle describing change and conflict */
12910	),
12911

	--- extsrc/sqlite3.h
	+++ extsrc/sqlite3.h
	@@ -144,13 +144,13 @@
144	**
145	** See also: [sqlite3_libversion()],
146	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147	** [sqlite_version()] and [sqlite_source_id()].
148	*/
149	#define SQLITE_VERSION "3.51.0"
150	#define SQLITE_VERSION_NUMBER 3051000
151	#define SQLITE_SOURCE_ID "2025-07-15 19:00:01 9f184f8dfa5ef6d57e10376adc30e0060ceda07d283c23dfdfe3dbdd6608f839"
152
153	/*
154	** CAPI3REF: Run-Time Library Version Numbers
155	** KEYWORDS: sqlite3_version sqlite3_sourceid
156	**
	@@ -166,13 +166,13 @@
166	** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
167	** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
168	** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
169	** </pre></blockquote>)^
170	**
171	** ^The sqlite3_version[] string constant contains the text of the
172	** [SQLITE_VERSION] macro. ^The sqlite3_libversion() function returns a
173	** pointer to the sqlite3_version[] string constant. The sqlite3_libversion()
174	** function is provided for use in DLLs since DLL users usually do not have
175	** direct access to string constants within the DLL. ^The
176	** sqlite3_libversion_number() function returns an integer equal to
177	** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
178	** a pointer to a string constant whose value is the same as the
	@@ -368,11 +368,11 @@
368	** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
369	** that allows an application to run multiple statements of SQL
370	** without having to use a lot of C code.
371	**
372	** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
373	** semicolon-separated SQL statements passed into its 2nd argument,
374	** in the context of the [database connection] passed in as its 1st
375	** argument. ^If the callback function of the 3rd argument to
376	** sqlite3_exec() is not NULL, then it is invoked for each result row
377	** coming out of the evaluated SQL statements. ^The 4th argument to
378	** sqlite3_exec() is relayed through to the 1st argument of each
	@@ -401,11 +401,11 @@
401	** callback is an array of pointers to strings obtained as if from
402	** [sqlite3_column_text()], one for each column. ^If an element of a
403	** result row is NULL then the corresponding string pointer for the
404	** sqlite3_exec() callback is a NULL pointer. ^The 4th argument to the
405	** sqlite3_exec() callback is an array of pointers to strings where each
406	** entry represents the name of a corresponding result column as obtained
407	** from [sqlite3_column_name()].
408	**
409	** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
410	** to an empty string, or a pointer that contains only whitespace and/or
411	** SQL comments, then no SQL statements are evaluated and the database
	@@ -587,11 +587,11 @@
587	** Applications should not depend on the historical behavior.
588	**
589	** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
590	** [sqlite3_open_v2()] does not cause the underlying database file
591	** to be opened using O_EXCL. Passing SQLITE_OPEN_EXCLUSIVE into
592	** [sqlite3_open_v2()] has historically been a no-op and might become an
593	** error in future versions of SQLite.
594	*/
595	#define SQLITE_OPEN_READONLY 0x00000001 /* Ok for sqlite3_open_v2() */
596	#define SQLITE_OPEN_READWRITE 0x00000002 /* Ok for sqlite3_open_v2() */
597	#define SQLITE_OPEN_CREATE 0x00000004 /* Ok for sqlite3_open_v2() */
	@@ -681,11 +681,11 @@
681	** CAPI3REF: File Locking Levels
682	**
683	** SQLite uses one of these integer values as the second
684	** argument to calls it makes to the xLock() and xUnlock() methods
685	** of an [sqlite3_io_methods] object. These values are ordered from
686	** least restrictive to most restrictive.
687	**
688	** The argument to xLock() is always SHARED or higher. The argument to
689	** xUnlock is either SHARED or NONE.
690	*/
691	#define SQLITE_LOCK_NONE 0 /* xUnlock() only */
	@@ -997,11 +997,11 @@
997	** reason, the entire database file will be overwritten by the current
998	** transaction. This is used by VACUUM operations.
999	**
1000	** <li>[[SQLITE_FCNTL_VFSNAME]]
1001	** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
1002	** all [VFSes] in the VFS stack. The names of all VFS shims and the
1003	** final bottom-level VFS are written into memory obtained from
1004	** [sqlite3_malloc()] and the result is stored in the char* variable
1005	** that the fourth parameter of [sqlite3_file_control()] points to.
1006	** The caller is responsible for freeing the memory when done. As with
1007	** all file-control actions, there is no guarantee that this will actually
	@@ -1011,11 +1011,11 @@
1011	**
1012	** <li>[[SQLITE_FCNTL_VFS_POINTER]]
1013	** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
1014	** [VFSes] currently in use. ^(The argument X in
1015	** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
1016	of type "[sqlite3_vfs] ". This opcode will set *X
1017	** to a pointer to the top-level VFS.)^
1018	** ^When there are multiple VFS shims in the stack, this opcode finds the
1019	** upper-most shim only.
1020	**
1021	** <li>[[SQLITE_FCNTL_PRAGMA]]
	@@ -1201,11 +1201,11 @@
1201	** record the fact that the pages have been checkpointed.
1202	**
1203	** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
1204	** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
1205	** whether or not there is a database client in another process with a wal-mode
1206	** transaction open on the database or not. It is only available on unix. The
1207	** (void*) argument passed with this file-control should be a pointer to a
1208	** value of type (int). The integer value is set to 1 if the database is a wal
1209	** mode database and there exists at least one client in another process that
1210	** currently has an SQL transaction open on the database. It is set to 0 if
1211	** the database is not a wal-mode db, or if there is no such connection in any
	@@ -1626,11 +1626,11 @@
1626	**
1627	** ^The sqlite3_initialize() routine is called internally by many other
1628	** SQLite interfaces so that an application usually does not need to
1629	** invoke sqlite3_initialize() directly. For example, [sqlite3_open()]
1630	** calls sqlite3_initialize() so the SQLite library will be automatically
1631	** initialized when [sqlite3_open()] is called if it has not been initialized
1632	** already. ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
1633	** compile-time option, then the automatic calls to sqlite3_initialize()
1634	** are omitted and the application must call sqlite3_initialize() directly
1635	** prior to using any other SQLite interface. For maximum portability,
1636	** it is recommended that applications always invoke sqlite3_initialize()
	@@ -1883,25 +1883,25 @@
1883	** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
1884	** is a pointer to an instance of the [sqlite3_mem_methods] structure.
1885	** The [sqlite3_mem_methods]
1886	** structure is filled with the currently defined memory allocation routines.)^
1887	** This option can be used to overload the default memory allocation
1888	** routines with a wrapper that simulates memory allocation failure or
1889	** tracks memory usage, for example. </dd>
1890	**
1891	** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
1892	** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes a single argument of
1893	** type int, interpreted as a boolean, which if true provides a hint to
1894	** SQLite that it should avoid large memory allocations if possible.
1895	** SQLite will run faster if it is free to make large memory allocations,
1896	** but some applications might prefer to run slower in exchange for
1897	** guarantees about memory fragmentation that are possible if large
1898	** allocations are avoided. This hint is normally off.
1899	** </dd>
1900	**
1901	** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
1902	** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes a single argument of type int,
1903	** interpreted as a boolean, which enables or disables the collection of
1904	** memory allocation statistics. ^(When memory allocation statistics are
1905	** disabled, the following SQLite interfaces become non-operational:
1906	** <ul>
1907	** <li> [sqlite3_hard_heap_limit64()]
	@@ -1942,11 +1942,11 @@
1942	** a page cache line is larger than sz bytes or if all of the pMem buffer
1943	** is exhausted.
1944	** ^If pMem is NULL and N is non-zero, then each database connection
1945	** does an initial bulk allocation for page cache memory
1946	** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
1947	** of -1024*N bytes if N is negative. ^If additional
1948	** page cache memory is needed beyond what is provided by the initial
1949	** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
1950	** additional cache line. </dd>
1951	**
1952	** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
	@@ -1971,11 +1971,11 @@
1971	**
1972	** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
1973	** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
1974	** pointer to an instance of the [sqlite3_mutex_methods] structure.
1975	** The argument specifies alternative low-level mutex routines to be used
1976	** in place of the mutex routines built into SQLite.)^ ^SQLite makes a copy of
1977	** the content of the [sqlite3_mutex_methods] structure before the call to
1978	** [sqlite3_config()] returns. ^If SQLite is compiled with
1979	** the [SQLITE_THREADSAFE \| SQLITE_THREADSAFE=0] compile-time option then
1980	** the entire mutexing subsystem is omitted from the build and hence calls to
1981	** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
	@@ -2013,11 +2013,11 @@
2013	** the interface to a custom page cache implementation.)^
2014	** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
2015	**
2016	** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
2017	** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
2018	** is a pointer to an [sqlite3_pcache_methods2] object. SQLite copies off
2019	** the current page cache implementation into that object.)^ </dd>
2020	**
2021	** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
2022	** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
2023	** global [error log].
	@@ -2030,11 +2030,11 @@
2030	** passed through as the first parameter to the application-defined logger
2031	** function whenever that function is invoked. ^The second parameter to
2032	** the logger function is a copy of the first parameter to the corresponding
2033	** [sqlite3_log()] call and is intended to be a [result code] or an
2034	** [extended result code]. ^The third parameter passed to the logger is
2035	** a log message after formatting via [sqlite3_snprintf()].
2036	** The SQLite logging interface is not reentrant; the logger function
2037	** supplied by the application must not invoke any SQLite interface.
2038	** In a multi-threaded application, the application-defined logger
2039	** function must be threadsafe. </dd>
2040	**
	@@ -2221,11 +2221,11 @@
2221	** CAPI3REF: Database Connection Configuration Options
2222	**
2223	** These constants are the available integer configuration options that
2224	** can be passed as the second parameter to the [sqlite3_db_config()] interface.
2225	**
2226	** The [sqlite3_db_config()] interface is a var-args function. It takes a
2227	** variable number of parameters, though always at least two. The number of
2228	** parameters passed into sqlite3_db_config() depends on which of these
2229	** constants is given as the second parameter. This documentation page
2230	** refers to parameters beyond the second as "arguments". Thus, when this
2231	** page says "the N-th argument" it means "the N-th parameter past the
	@@ -2355,12 +2355,12 @@
2355	** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
2356	** There must be two additional arguments.
2357	** When the first argument to this interface is 1, then only the C-API is
2358	** enabled and the SQL function remains disabled. If the first argument to
2359	** this interface is 0, then both the C-API and the SQL function are disabled.
2360	** If the first argument is -1, then no changes are made to the state of either
2361	** the C-API or the SQL function.
2362	** The second parameter is a pointer to an integer into which
2363	** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
2364	** is disabled or enabled following this call. The second parameter may
2365	** be a NULL pointer, in which case the new setting is not reported back.
2366	** </dd>
	@@ -2474,11 +2474,11 @@
2474	** </dd>
2475	**
2476	** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
2477	** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
2478	** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
2479	** the legacy behavior of the [ALTER TABLE RENAME] command such that it
2480	** behaves as it did prior to [version 3.24.0] (2018-06-04). See the
2481	** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
2482	** additional information. This feature can also be turned on and off
2483	** using the [PRAGMA legacy_alter_table] statement.
2484	** </dd>
	@@ -2523,11 +2523,11 @@
2523	**
2524	** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
2525	** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
2526	** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
2527	** the legacy file format flag. When activated, this flag causes all newly
2528	** created database files to have a schema format version number (the 4-byte
2529	** integer found at offset 44 into the database header) of 1. This in turn
2530	** means that the resulting database file will be readable and writable by
2531	** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
2532	** newly created databases are generally not understandable by SQLite versions
2533	** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
	@@ -2550,11 +2550,11 @@
2550	** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2551	** statistics. For statistics to be collected, the flag must be set on
2552	** the database handle both when the SQL statement is prepared and when it
2553	** is stepped. The flag is set (collection of statistics is enabled)
2554	** by default. <p>This option takes two arguments: an integer and a pointer to
2555	** an integer. The first argument is 1, 0, or -1 to enable, disable, or
2556	** leave unchanged the statement scanstatus option. If the second argument
2557	** is not NULL, then the value of the statement scanstatus setting after
2558	** processing the first argument is written into the integer that the second
2559	** argument points to.
2560	** </dd>
	@@ -2593,12 +2593,12 @@
2593	** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
2594	** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
2595	** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
2596	** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
2597	** This capability is enabled by default. Applications can disable or
2598	** reenable this capability using the current DBCONFIG option. If
2599	** this capability is disabled, the [ATTACH] command will still work,
2600	** but the database will be opened read-only. If this option is disabled,
2601	** then the ability to create a new database using [ATTACH] is also disabled,
2602	** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
2603	** option.<p>
2604	** This option takes two arguments which are an integer and a pointer
	@@ -2628,11 +2628,11 @@
2628	**
2629	** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
2630	**
2631	** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
2632	** overall call to [sqlite3_db_config()] has a total of four parameters.
2633	** The first argument (the third parameter to sqlite3_db_config()) is an integer.
2634	** The second argument is a pointer to an integer. If the first argument is 1,
2635	** then the option becomes enabled. If the first integer argument is 0, then the
2636	** option is disabled. If the first argument is -1, then the option setting
2637	** is unchanged. The second argument, the pointer to an integer, may be NULL.
2638	** If the second argument is not NULL, then a value of 0 or 1 is written into
	@@ -2918,11 +2918,11 @@
2918	** and comments that follow the final semicolon are ignored.
2919	**
2920	** ^These routines return 0 if the statement is incomplete. ^If a
2921	** memory allocation fails, then SQLITE_NOMEM is returned.
2922	**
2923	** ^These routines do not parse the SQL statements and thus
2924	** will not detect syntactically incorrect SQL.
2925	**
2926	** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
2927	** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
2928	** automatically by sqlite3_complete16(). If that initialization fails,
	@@ -3035,11 +3035,11 @@
3035	** Passing 0 to this function disables blocking locks altogether. Passing
3036	** -1 to this function requests that the VFS blocks for a long time -
3037	** indefinitely if possible. The results of passing any other negative value
3038	** are undefined.
3039	**
3040	** Internally, each SQLite database handle stores two timeout values - the
3041	** busy-timeout (used for rollback mode databases, or if the VFS does not
3042	** support blocking locks) and the setlk-timeout (used for blocking locks
3043	** on wal-mode databases). The sqlite3_busy_timeout() method sets both
3044	** values, this function sets only the setlk-timeout value. Therefore,
3045	** to configure separate busy-timeout and setlk-timeout values for a single
	@@ -3065,11 +3065,11 @@
3065	** METHOD: sqlite3
3066	**
3067	** This is a legacy interface that is preserved for backwards compatibility.
3068	** Use of this interface is not recommended.
3069	**
3070	** Definition: A <b>result table</b> is a memory data structure created by the
3071	** [sqlite3_get_table()] interface. A result table records the
3072	** complete query results from one or more queries.
3073	**
3074	** The table conceptually has a number of rows and columns. But
3075	** these numbers are not part of the result table itself. These
	@@ -3208,11 +3208,11 @@
3208	** of a signed 32-bit integer.
3209	**
3210	** ^Calling sqlite3_free() with a pointer previously returned
3211	** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
3212	** that it might be reused. ^The sqlite3_free() routine is
3213	** a no-op if it is called with a NULL pointer. Passing a NULL pointer
3214	** to sqlite3_free() is harmless. After being freed, memory
3215	** should neither be read nor written. Even reading previously freed
3216	** memory might result in a segmentation fault or other severe error.
3217	** Memory corruption, a segmentation fault, or other severe error
3218	** might result if sqlite3_free() is called with a non-NULL pointer that
	@@ -3226,17 +3226,17 @@
3226	** ^If the N parameter to sqlite3_realloc(X,N) is zero or
3227	** negative then the behavior is exactly the same as calling
3228	** sqlite3_free(X).
3229	** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
3230	** of at least N bytes in size or NULL if insufficient memory is available.
3231	** ^If M is the size of the prior allocation, then min(N,M) bytes of the
3232	** prior allocation are copied into the beginning of the buffer returned
3233	** by sqlite3_realloc(X,N) and the prior allocation is freed.
3234	** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
3235	** prior allocation is not freed.
3236	**
3237	** ^The sqlite3_realloc64(X,N) interface works the same as
3238	** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
3239	** of a 32-bit signed integer.
3240	**
3241	** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
3242	** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
	@@ -3282,11 +3282,11 @@
3282	** ^The [sqlite3_memory_highwater()] routine returns the maximum
3283	** value of [sqlite3_memory_used()] since the high-water mark
3284	** was last reset. ^The values returned by [sqlite3_memory_used()] and
3285	** [sqlite3_memory_highwater()] include any overhead
3286	** added by SQLite in its implementation of [sqlite3_malloc()],
3287	** but not overhead added by any underlying system library
3288	** routines that [sqlite3_malloc()] may call.
3289	**
3290	** ^The memory high-water mark is reset to the current value of
3291	** [sqlite3_memory_used()] if and only if the parameter to
3292	** [sqlite3_memory_highwater()] is true. ^The value returned
	@@ -3734,19 +3734,19 @@
3734	** attempt to use the same database connection at the same time.
3735	** (Mutexes will block any actual concurrency, but in this mode
3736	** there is no harm in trying.)
3737	**
3738	** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
3739	** <dd>The database is opened with [shared cache] enabled, overriding
3740	** the default shared cache setting provided by
3741	** [sqlite3_enable_shared_cache()].)^
3742	** The [use of shared cache mode is discouraged] and hence shared cache
3743	** capabilities may be omitted from many builds of SQLite. In such cases,
3744	** this option is a no-op.
3745	**
3746	** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
3747	** <dd>The database is opened with [shared cache] disabled, overriding
3748	** the default shared cache setting provided by
3749	** [sqlite3_enable_shared_cache()].)^
3750	**
3751	** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
3752	** <dd>The database connection comes up in "extended result code mode".
	@@ -4077,11 +4077,11 @@
4077	** These interfaces are provided for use by [VFS shim] implementations and
4078	** are not useful outside of that context.
4079	**
4080	** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
4081	** database filename D with corresponding journal file J and WAL file W and
4082	** an array P of N URI Key/Value pairs. The result from
4083	** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
4084	** is safe to pass to routines like:
4085	** <ul>
4086	** <li> [sqlite3_uri_parameter()],
4087	** <li> [sqlite3_uri_boolean()],
	@@ -4160,19 +4160,19 @@
4160	** The application does not need to worry about freeing the result.
4161	** However, the error string might be overwritten or deallocated by
4162	** subsequent calls to other SQLite interface functions.)^
4163	**
4164	** ^The sqlite3_errstr(E) interface returns the English-language text
4165	** that describes the [result code] E, as UTF-8, or NULL if E is not a
4166	** result code for which a text error message is available.
4167	** ^(Memory to hold the error message string is managed internally
4168	** and must not be freed by the application)^.
4169	**
4170	** ^If the most recent error references a specific token in the input
4171	** SQL, the sqlite3_error_offset() interface returns the byte offset
4172	** of the start of that token. ^The byte offset returned by
4173	** sqlite3_error_offset() assumes that the input SQL is UTF-8.
4174	** ^If the most recent error does not reference a specific token in the input
4175	** SQL, then the sqlite3_error_offset() function returns -1.
4176	**
4177	** When the serialized [threading mode] is in use, it might be the
4178	** case that a second error occurs on a separate thread in between
	@@ -4267,12 +4267,12 @@
4267	** CAPI3REF: Run-Time Limit Categories
4268	** KEYWORDS: {limit category} {*limit categories}
4269	**
4270	** These constants define various performance limits
4271	** that can be lowered at run-time using [sqlite3_limit()].
4272	** A concise description of these limits follows, and additional information
4273	** is available at [limits \| Limits in SQLite].
4274	**
4275	** <dl>
4276	** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
4277	** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
4278	**
	@@ -4333,11 +4333,11 @@
4333	#define SQLITE_LIMIT_WORKER_THREADS 11
4334
4335	/*
4336	** CAPI3REF: Prepare Flags
4337	**
4338	** These constants define various flags that can be passed into the
4339	** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
4340	** [sqlite3_prepare16_v3()] interfaces.
4341	**
4342	** New flags may be added in future releases of SQLite.
4343	**
	@@ -4420,11 +4420,11 @@
4420	** statement is generated.
4421	** If the caller knows that the supplied string is nul-terminated, then
4422	** there is a small performance advantage to passing an nByte parameter that
4423	** is the number of bytes in the input string <i>including</i>
4424	** the nul-terminator.
4425	** Note that nByte measures the length of the input in bytes, not
4426	** characters, even for the UTF-16 interfaces.
4427	**
4428	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
4429	** past the end of the first SQL statement in zSql. These routines only
4430	** compile the first statement in zSql, so *pzTail is left pointing to
	@@ -4554,11 +4554,11 @@
4554	** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
4555	** will return "SELECT 2345,NULL".)^
4556	**
4557	** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
4558	** is available to hold the result, or if the result would exceed the
4559	** maximum string length determined by the [SQLITE_LIMIT_LENGTH].
4560	**
4561	** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
4562	** bound parameter expansions. ^The [SQLITE_OMIT_TRACE] compile-time
4563	** option causes sqlite3_expanded_sql() to always return NULL.
4564	**
	@@ -4742,11 +4742,11 @@
4742	/*
4743	** CAPI3REF: SQL Function Context Object
4744	**
4745	** The context in which an SQL function executes is stored in an
4746	** sqlite3_context object. ^A pointer to an sqlite3_context object
4747	** is always the first parameter to [application-defined SQL functions].
4748	** The application-defined SQL function implementation will pass this
4749	** pointer through into calls to [sqlite3_result_int \| sqlite3_result()],
4750	** [sqlite3_aggregate_context()], [sqlite3_user_data()],
4751	** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
4752	** and/or [sqlite3_set_auxdata()].
	@@ -4758,11 +4758,11 @@
4758	** KEYWORDS: {host parameter} {host parameters} {host parameter name}
4759	** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
4760	** METHOD: sqlite3_stmt
4761	**
4762	** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
4763	** literals may be replaced by a [parameter] that matches one of the following
4764	** templates:
4765	**
4766	** <ul>
4767	** <li> ?
4768	** <li> ?NNN
	@@ -4803,11 +4803,11 @@
4803	** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
4804	** otherwise.
4805	**
4806	** [[byte-order determination rules]] ^The byte-order of
4807	** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
4808	** found in the first character, which is removed, or in the absence of a BOM
4809	** the byte order is the native byte order of the host
4810	** machine for sqlite3_bind_text16() or the byte order specified in
4811	** the 6th parameter for sqlite3_bind_text64().)^
4812	** ^If UTF16 input text contains invalid unicode
4813	** characters, then SQLite might change those invalid characters
	@@ -4823,11 +4823,11 @@
4823	** the behavior is undefined.
4824	** If a non-negative fourth parameter is provided to sqlite3_bind_text()
4825	** or sqlite3_bind_text16() or sqlite3_bind_text64() then
4826	** that parameter must be the byte offset
4827	** where the NUL terminator would occur assuming the string were NUL
4828	** terminated. If any NUL characters occur at byte offsets less than
4829	** the value of the fourth parameter then the resulting string value will
4830	** contain embedded NULs. The result of expressions involving strings
4831	** with embedded NULs is undefined.
4832	**
4833	** ^The fifth argument to the BLOB and string binding interfaces controls
	@@ -5035,11 +5035,11 @@
5035	/*
5036	** CAPI3REF: Source Of Data In A Query Result
5037	** METHOD: sqlite3_stmt
5038	**
5039	** ^These routines provide a means to determine the database, table, and
5040	** table column that is the origin of a particular result column in a
5041	** [SELECT] statement.
5042	** ^The name of the database or table or column can be returned as
5043	** either a UTF-8 or UTF-16 string. ^The _database_ routines return
5044	** the database name, the _table_ routines return the table name, and
5045	** the origin_ routines return the column name.
	@@ -5479,11 +5479,11 @@
5479	** CAPI3REF: Destroy A Prepared Statement Object
5480	** DESTRUCTOR: sqlite3_stmt
5481	**
5482	** ^The sqlite3_finalize() function is called to delete a [prepared statement].
5483	** ^If the most recent evaluation of the statement encountered no errors
5484	** or if the statement has never been evaluated, then sqlite3_finalize() returns
5485	** SQLITE_OK. ^If the most recent evaluation of statement S failed, then
5486	** sqlite3_finalize(S) returns the appropriate [error code] or
5487	** [extended error code].
5488	**
5489	** ^The sqlite3_finalize(S) routine can be called at any point during
	@@ -5604,12 +5604,12 @@
5604	** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
5605	** index expressions, or the WHERE clause of partial indexes.
5606	**
5607	** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
5608	** all application-defined SQL functions that do not need to be
5609	** used inside of triggers, views, CHECK constraints, or other elements of
5610	** the database schema. This flag is especially recommended for SQL
5611	** functions that have side effects or reveal internal application state.
5612	** Without this flag, an attacker might be able to modify the schema of
5613	** a database file to include invocations of the function with parameters
5614	** chosen by the attacker, which the application will then execute when
5615	** the database file is opened and read.
	@@ -5636,11 +5636,11 @@
5636	** or aggregate window function. More details regarding the implementation
5637	** of aggregate window functions are
5638	** [user-defined window functions\|available here].
5639	**
5640	** ^(If the final parameter to sqlite3_create_function_v2() or
5641	** sqlite3_create_window_function() is not NULL, then it is the destructor for
5642	** the application data pointer. The destructor is invoked when the function
5643	** is deleted, either by being overloaded or when the database connection
5644	** closes.)^ ^The destructor is also invoked if the call to
5645	** sqlite3_create_function_v2() fails. ^When the destructor callback is
5646	** invoked, it is passed a single argument which is a copy of the application
	@@ -5711,11 +5711,11 @@
5711	);
5712
5713	/*
5714	** CAPI3REF: Text Encodings
5715	**
5716	** These constants define integer codes that represent the various
5717	** text encodings supported by SQLite.
5718	*/
5719	#define SQLITE_UTF8 1 /* IMP: R-37514-35566 */
5720	#define SQLITE_UTF16LE 2 /* IMP: R-03371-37637 */
5721	#define SQLITE_UTF16BE 3 /* IMP: R-51971-34154 */
	@@ -5803,11 +5803,11 @@
5803	** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
5804	** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
5805	** result.
5806	** Every function that invokes [sqlite3_result_subtype()] should have this
5807	** property. If it does not, then the call to [sqlite3_result_subtype()]
5808	** might become a no-op if the function is used as a term in an
5809	** [expression index]. On the other hand, SQL functions that never invoke
5810	** [sqlite3_result_subtype()] should avoid setting this property, as the
5811	** purpose of this property is to disable certain optimizations that are
5812	** incompatible with subtypes.
5813	**
	@@ -5930,11 +5930,11 @@
5930	**
5931	** ^Within the [xUpdate] method of a [virtual table], the
5932	** sqlite3_value_nochange(X) interface returns true if and only if
5933	** the column corresponding to X is unchanged by the UPDATE operation
5934	** that the xUpdate method call was invoked to implement and if
5935	** the prior [xColumn] method call that was invoked to extract
5936	** the value for that column returned without setting a result (probably
5937	** because it queried [sqlite3_vtab_nochange()] and found that the column
5938	** was unchanging). ^Within an [xUpdate] method, any value for which
5939	** sqlite3_value_nochange(X) is true will in all other respects appear
5940	** to be a NULL value. If sqlite3_value_nochange(X) is invoked anywhere other
	@@ -6036,11 +6036,11 @@
6036	/*
6037	** CAPI3REF: Copy And Free SQL Values
6038	** METHOD: sqlite3_value
6039	**
6040	** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
6041	** object V and returns a pointer to that copy. ^The [sqlite3_value] returned
6042	** is a [protected sqlite3_value] object even if the input is not.
6043	** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
6044	** memory allocation fails. ^If V is a [pointer value], then the result
6045	** of sqlite3_value_dup(V) is a NULL value.
6046	**
	@@ -6074,11 +6074,11 @@
6074	** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
6075	** when first called if N is less than or equal to zero or if a memory
6076	** allocation error occurs.
6077	**
6078	** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
6079	** determined by the N parameter on the first successful call. Changing the
6080	** value of N in any subsequent call to sqlite3_aggregate_context() within
6081	** the same aggregate function instance will not resize the memory
6082	** allocation.)^ Within the xFinal callback, it is customary to set
6083	** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
6084	** pointless memory allocations occur.
	@@ -6236,11 +6236,11 @@
6236	** of as a secret key such that only code that knows the secret key is able
6237	** to access the associated data.
6238	**
6239	** Security Warning: These interfaces should not be exposed in scripting
6240	** languages or in other circumstances where it might be possible for an
6241	** attacker to invoke them. Any agent that can invoke these interfaces
6242	** can probably also take control of the process.
6243	**
6244	** Database connection client data is only available for SQLite
6245	** version 3.44.0 ([dateof:3.44.0]) and later.
6246	**
	@@ -6350,11 +6350,11 @@
6350	** ^If the 3rd parameter to the sqlite3_result_text* interfaces
6351	** is non-negative, then as many bytes (not characters) of the text
6352	** pointed to by the 2nd parameter are taken as the application-defined
6353	** function result. If the 3rd parameter is non-negative, then it
6354	** must be the byte offset into the string where the NUL terminator would
6355	** appear if the string were NUL terminated. If any NUL characters occur
6356	** in the string at a byte offset that is less than the value of the 3rd
6357	** parameter, then the resulting string will contain embedded NULs and the
6358	** result of expressions operating on strings with embedded NULs is undefined.
6359	** ^If the 4th parameter to the sqlite3_result_text* interfaces
6360	** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
	@@ -6408,11 +6408,11 @@
6408	** for the P parameter. ^SQLite invokes D with P as its only argument
6409	** when SQLite is finished with P. The T parameter should be a static
6410	** string and preferably a string literal. The sqlite3_result_pointer()
6411	** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
6412	**
6413	** If these routines are called from within a different thread
6414	** than the one containing the application-defined function that received
6415	** the [sqlite3_context] pointer, the results are undefined.
6416	*/
6417	SQLITE_API void sqlite3_result_blob(sqlite3_context, const void, int, void()(void));
6418	SQLITE_API void sqlite3_result_blob64(sqlite3_context,const void,
	@@ -6814,11 +6814,11 @@
6814	/*
6815	** CAPI3REF: Return The Schema Name For A Database Connection
6816	** METHOD: sqlite3
6817	**
6818	** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
6819	** for the N-th database on database connection D, or a NULL pointer if N is
6820	** out of range. An N value of 0 means the main database file. An N of 1 is
6821	** the "temp" schema. Larger values of N correspond to various ATTACH-ed
6822	** databases.
6823	**
6824	** Space to hold the string that is returned by sqlite3_db_name() is managed
	@@ -6909,20 +6909,20 @@
6909	**
6910	** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
6911	** <dd>The SQLITE_TXN_READ state means that the database is currently
6912	** in a read transaction. Content has been read from the database file
6913	** but nothing in the database file has changed. The transaction state
6914	** will be advanced to SQLITE_TXN_WRITE if any changes occur and there are
6915	** no other conflicting concurrent write transactions. The transaction
6916	** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
6917	** [COMMIT].</dd>
6918	**
6919	** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
6920	** <dd>The SQLITE_TXN_WRITE state means that the database is currently
6921	** in a write transaction. Content has been written to the database file
6922	** but has not yet committed. The transaction state will change to
6923	** SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
6924	*/
6925	#define SQLITE_TXN_NONE 0
6926	#define SQLITE_TXN_READ 1
6927	#define SQLITE_TXN_WRITE 2
6928
	@@ -7199,11 +7199,11 @@
7199
7200	/*
7201	** CAPI3REF: Impose A Limit On Heap Size
7202	**
7203	** These interfaces impose limits on the amount of heap memory that will be
7204	** used by all database connections within a single process.
7205	**
7206	** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
7207	** soft limit on the amount of heap memory that may be allocated by SQLite.
7208	** ^SQLite strives to keep heap memory utilization below the soft heap
7209	** limit by reducing the number of pages held in the page cache
	@@ -7257,11 +7257,11 @@
7257	** by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
7258	** from the heap.
7259	** </ul>)^
7260	**
7261	** The circumstances under which SQLite will enforce the heap limits may
7262	** change in future releases of SQLite.
7263	*/
7264	SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
7265	SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
7266
7267	/*
	@@ -7372,12 +7372,12 @@
7372	** be tried also.
7373	**
7374	** ^The entry point is zProc.
7375	** ^(zProc may be 0, in which case SQLite will try to come up with an
7376	** entry point name on its own. It first tries "sqlite3_extension_init".
7377	** If that does not work, it constructs a name "sqlite3_X_init" where
7378	** X consists of the lower-case equivalent of all ASCII alphabetic
7379	** characters in the filename from the last "/" to the first following
7380	** "." and omitting any initial "lib".)^
7381	** ^The sqlite3_load_extension() interface returns
7382	** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
7383	** ^If an error occurs and pzErrMsg is not 0, then the
	@@ -7444,11 +7444,11 @@
7444	** that is to be automatically loaded into all new database connections.
7445	**
7446	** ^(Even though the function prototype shows that xEntryPoint() takes
7447	** no arguments and returns void, SQLite invokes xEntryPoint() with three
7448	** arguments and expects an integer result as if the signature of the
7449	** entry point were as follows:
7450	**
7451	** <blockquote><pre>
7452	**   int xEntryPoint(
7453	**   sqlite3 *db,
7454	const char pzErrMsg,
	@@ -7608,11 +7608,11 @@
7608	** and becomes the argvIndex-th entry in argv. ^(If aConstraintUsage[].omit
7609	** is true, then the constraint is assumed to be fully handled by the
7610	** virtual table and might not be checked again by the byte code.)^ ^(The
7611	** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
7612	** is left in its default setting of false, the constraint will always be
7613	** checked separately in byte code. If the omit flag is changed to true, then
7614	** the constraint may or may not be checked in byte code. In other words,
7615	** when the omit flag is true there is no guarantee that the constraint will
7616	** not be checked again using byte code.)^
7617	**
7618	** ^The idxNum and idxStr values are recorded and passed into the
	@@ -7634,11 +7634,11 @@
7634	** will be returned by the strategy.
7635	**
7636	** The xBestIndex method may optionally populate the idxFlags field with a
7637	** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
7638	** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
7639	** output to show the idxNum as hex instead of as decimal. Another flag is
7640	** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
7641	** return at most one row.
7642	**
7643	** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
7644	** SQLite also assumes that if a call to the xUpdate() method is made as
	@@ -7775,11 +7775,11 @@
7775	** by the first parameter. ^The name of the module is given by the
7776	** second parameter. ^The third parameter is a pointer to
7777	** the implementation of the [virtual table module]. ^The fourth
7778	** parameter is an arbitrary client data pointer that is passed through
7779	** into the [xCreate] and [xConnect] methods of the virtual table module
7780	** when a new virtual table is being created or reinitialized.
7781	**
7782	** ^The sqlite3_create_module_v2() interface has a fifth parameter which
7783	** is a pointer to a destructor for the pClientData. ^SQLite will
7784	** invoke the destructor function (if it is not NULL) when SQLite
7785	** no longer needs the pClientData pointer. ^The destructor will also
	@@ -7940,11 +7940,11 @@
7940	**
7941	** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
7942	** in *ppBlob. Otherwise an [error code] is returned and, unless the error
7943	** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
7944	** the API is not misused, it is always safe to call [sqlite3_blob_close()]
7945	** on *ppBlob after this function returns.
7946	**
7947	** This function fails with SQLITE_ERROR if any of the following are true:
7948	** <ul>
7949	** <li> ^(Database zDb does not exist)^,
7950	** <li> ^(Table zTable does not exist within database zDb)^,
	@@ -8060,11 +8060,11 @@
8060	** CAPI3REF: Return The Size Of An Open BLOB
8061	** METHOD: sqlite3_blob
8062	**
8063	** ^Returns the size in bytes of the BLOB accessible via the
8064	** successfully opened [BLOB handle] in its only argument. ^The
8065	** incremental blob I/O routines can only read or overwrite existing
8066	** blob content; they cannot change the size of a blob.
8067	**
8068	** This routine only works on a [BLOB handle] which has been created
8069	** by a prior successful call to [sqlite3_blob_open()] and which has not
8070	** been closed by [sqlite3_blob_close()]. Passing any other pointer in
	@@ -8210,11 +8210,11 @@
8210	** function that calls sqlite3_initialize().
8211	**
8212	** ^The sqlite3_mutex_alloc() routine allocates a new
8213	** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
8214	** routine returns NULL if it is unable to allocate the requested
8215	** mutex. The argument to sqlite3_mutex_alloc() must be one of these
8216	** integer constants:
8217	**
8218	** <ul>
8219	** <li> SQLITE_MUTEX_FAST
8220	** <li> SQLITE_MUTEX_RECURSIVE
	@@ -8443,11 +8443,11 @@
8443
8444	/*
8445	** CAPI3REF: Retrieve the mutex for a database connection
8446	** METHOD: sqlite3
8447	**
8448	** ^This interface returns a pointer to the [sqlite3_mutex] object that
8449	** serializes access to the [database connection] given in the argument
8450	** when the [threading mode] is Serialized.
8451	** ^If the [threading mode] is Single-thread or Multi-thread then this
8452	** routine returns a NULL pointer.
8453	*/
	@@ -8566,11 +8566,11 @@
8566
8567	/*
8568	** CAPI3REF: SQL Keyword Checking
8569	**
8570	** These routines provide access to the set of SQL language keywords
8571	** recognized by SQLite. Applications can use these routines to determine
8572	** whether or not a specific identifier needs to be escaped (for example,
8573	** by enclosing in double-quotes) so as not to confuse the parser.
8574	**
8575	** The sqlite3_keyword_count() interface returns the number of distinct
8576	** keywords understood by SQLite.
	@@ -8734,11 +8734,11 @@
8734	**
8735	** ^The [sqlite3_str_value(X)] method returns a pointer to the current
8736	** content of the dynamic string under construction in X. The value
8737	** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
8738	** and might be freed or altered by any subsequent method on the same
8739	** [sqlite3_str] object. Applications must not use the pointer returned by
8740	** [sqlite3_str_value(X)] after any subsequent method call on the same
8741	** object. ^Applications may change the content of the string returned
8742	** by [sqlite3_str_value(X)] as long as they do not write into any bytes
8743	** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
8744	** write any byte after any subsequent sqlite3_str method call.
	@@ -8820,11 +8820,11 @@
8820	** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
8821	** <dd>This parameter returns the number of bytes of page cache
8822	** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
8823	** buffer and where forced to overflow to [sqlite3_malloc()]. The
8824	** returned value includes allocations that overflowed because they
8825	** were too large (they were larger than the "sz" parameter to
8826	** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
8827	** no space was left in the page cache.</dd>)^
8828	**
8829	** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
8830	** <dd>This parameter records the largest memory allocation request
	@@ -8904,53 +8904,55 @@
8904	** checked out.</dd>)^
8905	**
8906	** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
8907	** <dd>This parameter returns the number of malloc attempts that were
8908	** satisfied using lookaside memory. Only the high-water value is meaningful;
8909	** the current value is always zero.</dd>)^
8910	**
8911	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
8912	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
8913	** <dd>This parameter returns the number of malloc attempts that might have
8914	** been satisfied using lookaside memory but failed due to the amount of
8915	** memory requested being larger than the lookaside slot size.
8916	** Only the high-water value is meaningful;
8917	** the current value is always zero.</dd>)^
8918	**
8919	** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
8920	** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
8921	** <dd>This parameter returns the number of malloc attempts that might have
8922	** been satisfied using lookaside memory but failed due to all lookaside
8923	** memory already being in use.
8924	** Only the high-water value is meaningful;
8925	** the current value is always zero.</dd>)^
8926	**
8927	** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
8928	** <dd>This parameter returns the approximate number of bytes of heap
8929	** memory used by all pager caches associated with the database connection.)^
8930	** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
8931	** </dd>
8932	**
8933	** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
8934	** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
8935	** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
8936	** pager cache is shared between two or more connections the bytes of heap
8937	** memory used by that pager cache is divided evenly between the attached
8938	** connections.)^ In other words, if none of the pager caches associated
8939	** with the database connection are shared, this request returns the same
8940	** value as DBSTATUS_CACHE_USED. Or, if one or more of the pager caches are
8941	** shared, the value returned by this call will be smaller than that returned
8942	** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
8943	** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.</dd>
8944	**
8945	** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
8946	** <dd>This parameter returns the approximate number of bytes of heap
8947	** memory used to store the schema for all databases associated
8948	** with the connection - main, temp, and any [ATTACH]-ed databases.)^
8949	** ^The full amount of memory used by the schemas is reported, even if the
8950	** schema memory is shared with other database connections due to
8951	** [shared cache mode] being enabled.
8952	** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
8953	** </dd>
8954	**
8955	** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
8956	** <dd>This parameter returns the approximate number of bytes of heap
8957	** and lookaside memory used by all prepared statements associated with
8958	** the database connection.)^
	@@ -8983,11 +8985,11 @@
8985	** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
8986	** <dd>This parameter returns the number of dirty cache entries that have
8987	** been written to disk in the middle of a transaction due to the page
8988	** cache overflowing. Transactions are more efficient if they are written
8989	** to disk all at once. When pages spill mid-transaction, that introduces
8990	** additional overhead. This parameter can be used to help identify
8991	** inefficiencies that can be resolved by increasing the cache size.
8992	** </dd>
8993	**
8994	** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
8995	** <dd>This parameter returns zero for the current value if and only if
	@@ -9054,48 +9056,48 @@
9056	** careful use of indices.</dd>
9057	**
9058	** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
9059	** <dd>^This is the number of sort operations that have occurred.
9060	** A non-zero value in this counter may indicate an opportunity to
9061	** improve performance through careful use of indices.</dd>
9062	**
9063	** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
9064	** <dd>^This is the number of rows inserted into transient indices that
9065	** were created automatically in order to help joins run faster.
9066	** A non-zero value in this counter may indicate an opportunity to
9067	** improve performance by adding permanent indices that do not
9068	** need to be reinitialized each time the statement is run.</dd>
9069	**
9070	** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
9071	** <dd>^This is the number of virtual machine operations executed
9072	** by the prepared statement if that number is less than or equal
9073	** to 2147483647. The number of virtual machine operations can be
9074	** used as a proxy for the total work done by the prepared statement.
9075	** If the number of virtual machine operations exceeds 2147483647
9076	** then the value returned by this statement status code is undefined.</dd>
9077	**
9078	** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
9079	** <dd>^This is the number of times that the prepare statement has been
9080	** automatically regenerated due to schema changes or changes to
9081	** [bound parameters] that might affect the query plan.</dd>
9082	**
9083	** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
9084	** <dd>^This is the number of times that the prepared statement has
9085	** been run. A single "run" for the purposes of this counter is one
9086	** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
9087	** The counter is incremented on the first [sqlite3_step()] call of each
9088	** cycle.</dd>
9089	**
9090	** [[SQLITE_STMTSTATUS_FILTER_MISS]]
9091	** [[SQLITE_STMTSTATUS_FILTER HIT]]
9092	** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
9093	** SQLITE_STMTSTATUS_FILTER_MISS</dt>
9094	** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
9095	** step was bypassed because a Bloom filter returned not-found. The
9096	** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
9097	** times that the Bloom filter returned a find, and thus the join step
9098	** had to be processed as normal.</dd>
9099	**
9100	** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
9101	** <dd>^This is the approximate number of bytes of heap memory
9102	** used to store the prepared statement. ^This value is not actually
9103	** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
	@@ -9196,31 +9198,31 @@
9198	** [[the xCreate() page cache methods]]
9199	** ^SQLite invokes the xCreate() method to construct a new cache instance.
9200	** SQLite will typically create one cache instance for each open database file,
9201	** though this is not guaranteed. ^The
9202	** first parameter, szPage, is the size in bytes of the pages that must
9203	** be allocated by the cache. ^szPage will always be a power of two. ^The
9204	** second parameter szExtra is a number of bytes of extra storage
9205	** associated with each page cache entry. ^The szExtra parameter will be
9206	** a number less than 250. SQLite will use the
9207	** extra szExtra bytes on each page to store metadata about the underlying
9208	** database page on disk. The value passed into szExtra depends
9209	** on the SQLite version, the target platform, and how SQLite was compiled.
9210	** ^The third argument to xCreate(), bPurgeable, is true if the cache being
9211	** created will be used to cache database pages of a file stored on disk, or
9212	** false if it is used for an in-memory database. The cache implementation
9213	** does not have to do anything special based upon the value of bPurgeable;
9214	** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
9215	** never invoke xUnpin() except to deliberately delete a page.
9216	** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
9217	** false will always have the "discard" flag set to true.
9218	** ^Hence, a cache created with bPurgeable set to false will
9219	** never contain any unpinned pages.
9220	**
9221	** [[the xCachesize() page cache method]]
9222	** ^(The xCachesize() method may be called at any time by SQLite to set the
9223	** suggested maximum cache-size (number of pages stored) for the cache
9224	** instance passed as the first argument. This is the value configured using
9225	** the SQLite "[PRAGMA cache_size]" command.)^ As with the bPurgeable
9226	** parameter, the implementation is not required to do anything with this
9227	** value; it is advisory only.
9228	**
	@@ -9243,16 +9245,16 @@
9245	**
9246	** If the requested page is already in the page cache, then the page cache
9247	** implementation must return a pointer to the page buffer with its content
9248	** intact. If the requested page is not already in the cache, then the
9249	** cache implementation should use the value of the createFlag
9250	** parameter to help it determine what action to take:
9251	**
9252	** <table border=1 width=85% align=center>
9253	** <tr><th> createFlag <th> Behavior when page is not already in cache
9254	** <tr><td> 0 <td> Do not allocate a new page. Return NULL.
9255	** <tr><td> 1 <td> Allocate a new page if it is easy and convenient to do so.
9256	** Otherwise return NULL.
9257	** <tr><td> 2 <td> Make every effort to allocate a new page. Only return
9258	** NULL if allocating a new page is effectively impossible.
9259	** </table>
9260	**
	@@ -9265,11 +9267,11 @@
9267	** [[the xUnpin() page cache method]]
9268	** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
9269	** as its second argument. If the third parameter, discard, is non-zero,
9270	** then the page must be evicted from the cache.
9271	** ^If the discard parameter is
9272	** zero, then the page may be discarded or retained at the discretion of the
9273	** page cache implementation. ^The page cache implementation
9274	** may choose to evict unpinned pages at any time.
9275	**
9276	** The cache must not perform any reference counting. A single
9277	** call to xUnpin() unpins the page regardless of the number of prior calls
	@@ -9283,11 +9285,11 @@
9285	** to be pinned.
9286	**
9287	** When SQLite calls the xTruncate() method, the cache must discard all
9288	** existing cache entries with page numbers (keys) greater than or equal
9289	** to the value of the iLimit parameter passed to xTruncate(). If any
9290	** of these pages are pinned, they become implicitly unpinned, meaning that
9291	** they can be safely discarded.
9292	**
9293	** [[the xDestroy() page cache method]]
9294	** ^The xDestroy() method is used to delete a cache allocated by xCreate().
9295	** All resources associated with the specified cache should be freed. ^After
	@@ -9463,11 +9465,11 @@
9465	** sqlite3_backup_step(), the source database may be modified mid-way
9466	** through the backup process. ^If the source database is modified by an
9467	** external process or via a database connection other than the one being
9468	** used by the backup operation, then the backup will be automatically
9469	** restarted by the next call to sqlite3_backup_step(). ^If the source
9470	** database is modified by using the same database connection as is used
9471	** by the backup operation, then the backup database is automatically
9472	** updated at the same time.
9473	**
9474	** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
9475	**
	@@ -9480,11 +9482,11 @@
9482	** active write-transaction on the destination database is rolled back.
9483	** The [sqlite3_backup] object is invalid
9484	** and may not be used following a call to sqlite3_backup_finish().
9485	**
9486	** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
9487	** sqlite3_backup_step() errors occurred, regardless of whether or not
9488	** sqlite3_backup_step() completed.
9489	** ^If an out-of-memory condition or IO error occurred during any prior
9490	** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
9491	** sqlite3_backup_finish() returns the corresponding [error code].
9492	**
	@@ -9582,11 +9584,11 @@
9584	** identity of the database connection (the blocking connection) that
9585	** has locked the required resource is stored internally. ^After an
9586	** application receives an SQLITE_LOCKED error, it may call the
9587	** sqlite3_unlock_notify() method with the blocked connection handle as
9588	** the first argument to register for a callback that will be invoked
9589	** when the blocking connection's current transaction is concluded. ^The
9590	** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
9591	** call that concludes the blocking connection's transaction.
9592	**
9593	** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
9594	** there is a chance that the blocking connection will have already
	@@ -9602,11 +9604,11 @@
9604	** ^(There may be at most one unlock-notify callback registered by a
9605	** blocked connection. If sqlite3_unlock_notify() is called when the
9606	** blocked connection already has a registered unlock-notify callback,
9607	** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
9608	** called with a NULL pointer as its second argument, then any existing
9609	** unlock-notify callback is canceled. ^The blocked connection's
9610	** unlock-notify callback may also be canceled by closing the blocked
9611	** connection using [sqlite3_close()].
9612	**
9613	** The unlock-notify callback is not reentrant. If an application invokes
9614	** any sqlite3_xxx API functions from within an unlock-notify callback, a
	@@ -10000,11 +10002,11 @@
10002	** where X is an integer. If X is zero, then the [virtual table] whose
10003	** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
10004	** support constraints. In this configuration (which is the default) if
10005	** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
10006	** statement is rolled back as if [ON CONFLICT \| OR ABORT] had been
10007	** specified as part of the user's SQL statement, regardless of the actual
10008	** ON CONFLICT mode specified.
10009	**
10010	** If X is non-zero, then the virtual table implementation guarantees
10011	** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
10012	** any modifications to internal or persistent data structures have been made.
	@@ -10034,11 +10036,11 @@
10036	** </dd>
10037	**
10038	** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
10039	** <dd>Calls of the form
10040	** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
10041	** [xConnect] or [xCreate] methods of a [virtual table] implementation
10042	** identify that virtual table as being safe to use from within triggers
10043	** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
10044	** virtual table can do no serious harm even if it is controlled by a
10045	** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
10046	** flag unless absolutely necessary.
	@@ -10202,21 +10204,21 @@
10204	** <tr><td>2<td>no<td>yes<td>yes
10205	** <tr><td>3<td>yes<td>yes<td>yes
10206	** </table>
10207	**
10208	** ^For the purposes of comparing virtual table output values to see if the
10209	** values are the same value for sorting purposes, two NULL values are considered
10210	** to be the same. In other words, the comparison operator is "IS"
10211	** (or "IS NOT DISTINCT FROM") and not "==".
10212	**
10213	** If a virtual table implementation is unable to meet the requirements
10214	** specified above, then it must not set the "orderByConsumed" flag in the
10215	** [sqlite3_index_info] object or an incorrect answer may result.
10216	**
10217	** ^A virtual table implementation is always free to return rows in any order
10218	** it wants, as long as the "orderByConsumed" flag is not set. ^When the
10219	** "orderByConsumed" flag is unset, the query planner will add extra
10220	** [bytecode] to ensure that the final results returned by the SQL query are
10221	** ordered correctly. The use of the "orderByConsumed" flag and the
10222	** sqlite3_vtab_distinct() interface is merely an optimization. ^Careful
10223	** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
10224	** flag might help queries against a virtual table to run faster. Being
	@@ -10309,11 +10311,11 @@
10311	**
10312	** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
10313	** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
10314	** xFilter method which invokes these routines, and specifically
10315	** a parameter that was previously selected for all-at-once IN constraint
10316	** processing using the [sqlite3_vtab_in()] interface in the
10317	** [xBestIndex\|xBestIndex method]. ^(If the X parameter is not
10318	** an xFilter argument that was selected for all-at-once IN constraint
10319	** processing, then these routines return [SQLITE_ERROR].)^
10320	**
10321	** ^(Use these routines to access all values on the right-hand side
	@@ -10364,11 +10366,11 @@
10366	** right-hand operand is not known, then *V is set to a NULL pointer.
10367	** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
10368	** and only if *V is set to a value. ^The sqlite3_vtab_rhs_value(P,J,V)
10369	** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
10370	** constraint is not available. ^The sqlite3_vtab_rhs_value() interface
10371	** can return a result code other than SQLITE_OK or SQLITE_NOTFOUND if
10372	** something goes wrong.
10373	**
10374	** The sqlite3_vtab_rhs_value() interface is usually only successful if
10375	** the right-hand operand of a constraint is a literal value in the original
10376	** SQL statement. If the right-hand operand is an expression or a reference
	@@ -10392,12 +10394,12 @@
10394	/*
10395	** CAPI3REF: Conflict resolution modes
10396	** KEYWORDS: {conflict resolution mode}
10397	**
10398	** These constants are returned by [sqlite3_vtab_on_conflict()] to
10399	** inform a [virtual table] implementation of the [ON CONFLICT] mode
10400	** for the SQL statement being evaluated.
10401	**
10402	** Note that the [SQLITE_IGNORE] constant is also used as a potential
10403	** return value from the [sqlite3_set_authorizer()] callback and that
10404	** [SQLITE_ABORT] is also a [result code].
10405	*/
	@@ -10433,43 +10435,43 @@
10435	** to the total number of rows examined by all iterations of the X-th loop.</dd>
10436	**
10437	** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
10438	** <dd>^The "double" variable pointed to by the V parameter will be set to the
10439	** query planner's estimate for the average number of rows output from each
10440	** iteration of the X-th loop. If the query planner's estimate was accurate,
10441	** then this value will approximate the quotient NVISIT/NLOOP and the
10442	** product of this value for all prior loops with the same SELECTID will
10443	** be the NLOOP value for the current loop.</dd>
10444	**
10445	** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
10446	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10447	** to a zero-terminated UTF-8 string containing the name of the index or table
10448	** used for the X-th loop.</dd>
10449	**
10450	** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
10451	** <dd>^The "const char *" variable pointed to by the V parameter will be set
10452	** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
10453	** description for the X-th loop.</dd>
10454	**
10455	** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
10456	** <dd>^The "int" variable pointed to by the V parameter will be set to the
10457	** id for the X-th query plan element. The id value is unique within the
10458	** statement. The select-id is the same value as is output in the first
10459	** column of an [EXPLAIN QUERY PLAN] query.</dd>
10460	**
10461	** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
10462	** <dd>The "int" variable pointed to by the V parameter will be set to the
10463	** id of the parent of the current query element, if applicable, or
10464	** to zero if the query element has no parent. This is the same value as
10465	** returned in the second column of an [EXPLAIN QUERY PLAN] query.</dd>
10466	**
10467	** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
10468	** <dd>The sqlite3_int64 output value is set to the number of cycles,
10469	** according to the processor time-stamp counter, that elapsed while the
10470	** query element was being processed. This value is not available for
10471	** all query elements - if it is unavailable the output variable is
10472	** set to -1.</dd>
10473	** </dl>
10474	*/
10475	#define SQLITE_SCANSTAT_NLOOP 0
10476	#define SQLITE_SCANSTAT_NVISIT 1
10477	#define SQLITE_SCANSTAT_EST 2
	@@ -10506,12 +10508,12 @@
10508	** the EXPLAIN QUERY PLAN output) are available. Invoking API
10509	** sqlite3_stmt_scanstatus() is equivalent to calling
10510	** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
10511	**
10512	** Parameter "idx" identifies the specific query element to retrieve statistics
10513	** for. Query elements are numbered starting from zero. A value of -1 may
10514	** retrieve statistics for the entire query. ^If idx is out of range
10515	** - less than -1 or greater than or equal to the total number of query
10516	** elements used to implement the statement - a non-zero value is returned and
10517	** the variable that pOut points to is unchanged.
10518	**
10519	** See also: [sqlite3_stmt_scanstatus_reset()]
	@@ -10550,11 +10552,11 @@
10552	/*
10553	** CAPI3REF: Flush caches to disk mid-transaction
10554	** METHOD: sqlite3
10555	**
10556	** ^If a write-transaction is open on [database connection] D when the
10557	** [sqlite3_db_cacheflush(D)] interface is invoked, any dirty
10558	** pages in the pager-cache that are not currently in use are written out
10559	** to disk. A dirty page may be in use if a database cursor created by an
10560	** active SQL statement is reading from it, or if it is page 1 of a database
10561	** file (page 1 is always "in use"). ^The [sqlite3_db_cacheflush(D)]
10562	** interface flushes caches for all schemas - "main", "temp", and
	@@ -10664,12 +10666,12 @@
10666	** operation; or 1 for inserts, updates, or deletes invoked by top-level
10667	** triggers; or 2 for changes resulting from triggers called by top-level
10668	** triggers; and so forth.
10669	**
10670	** When the [sqlite3_blob_write()] API is used to update a blob column,
10671	** the pre-update hook is invoked with SQLITE_DELETE, because
10672	** the new values are not yet available. In this case, when a
10673	** callback made with op==SQLITE_DELETE is actually a write using the
10674	** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
10675	** the index of the column being written. In other cases, where the
10676	** pre-update hook is being invoked for some other reason, including a
10677	** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
	@@ -10918,20 +10920,20 @@
10920	** is written into *P.
10921	**
10922	** For an ordinary on-disk database file, the serialization is just a
10923	** copy of the disk file. For an in-memory database or a "TEMP" database,
10924	** the serialization is the same sequence of bytes which would be written
10925	** to disk if that database were backed up to disk.
10926	**
10927	** The usual case is that sqlite3_serialize() copies the serialization of
10928	** the database into memory obtained from [sqlite3_malloc64()] and returns
10929	** a pointer to that memory. The caller is responsible for freeing the
10930	** returned value to avoid a memory leak. However, if the F argument
10931	** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
10932	** are made, and the sqlite3_serialize() function will return a pointer
10933	** to the contiguous memory representation of the database that SQLite
10934	** is currently using for that database, or NULL if no such contiguous
10935	** memory representation of the database exists. A contiguous memory
10936	** representation of the database will usually only exist if there has
10937	** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
10938	** values of D and S.
10939	** The size of the database is written into *P even if the
	@@ -10998,11 +11000,11 @@
11000	**
11001	** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
11002	** database is currently in a read transaction or is involved in a backup
11003	** operation.
11004	**
11005	** It is not possible to deserialize into the TEMP database. If the
11006	** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
11007	** function returns SQLITE_ERROR.
11008	**
11009	** The deserialized database should not be in [WAL mode]. If the database
11010	** is in WAL mode, then any attempt to use the database file will result
	@@ -11020,19 +11022,19 @@
11022	*/
11023	SQLITE_API int sqlite3_deserialize(
11024	sqlite3 db, / The database connection */
11025	const char zSchema, / Which DB to reopen with the deserialization */
11026	unsigned char pData, / The serialized database content */
11027	sqlite3_int64 szDb, /* Number of bytes in the deserialization */
11028	sqlite3_int64 szBuf, /* Total size of buffer pData[] */
11029	unsigned mFlags /* Zero or more SQLITE_DESERIALIZE_* flags */
11030	);
11031
11032	/*
11033	** CAPI3REF: Flags for sqlite3_deserialize()
11034	**
11035	** The following are allowed values for the 6th argument (the F argument) to
11036	** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
11037	**
11038	** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
11039	** in the P argument is held in memory obtained from [sqlite3_malloc64()]
11040	** and that SQLite should take ownership of this memory and automatically
	@@ -11553,13 +11555,14 @@
11555	** This may appear to have some counter-intuitive effects if a single row
11556	** is written to more than once during a session. For example, if a row
11557	** is inserted while a session object is enabled, then later deleted while
11558	** the same session object is disabled, no INSERT record will appear in the
11559	** changeset, even though the delete took place while the session was disabled.
11560	** Or, if one field of a row is updated while a session is enabled, and
11561	** then another field of the same row is updated while the session is disabled,
11562	** the resulting changeset will contain an UPDATE change that updates both
11563	** fields.
11564	*/
11565	SQLITE_API int sqlite3session_changeset(
11566	sqlite3_session pSession, / Session object */
11567	int pnChangeset, / OUT: Size of buffer at ppChangeset /
11568	void *ppChangeset / OUT: Buffer containing changeset */
	@@ -11764,11 +11767,11 @@
11767	** CAPI3REF: Flags for sqlite3changeset_start_v2
11768	**
11769	** The following flags may passed via the 4th parameter to
11770	** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
11771	**
11772	** <dt>SQLITE_CHANGESETSTART_INVERT <dd>
11773	** Invert the changeset while iterating through it. This is equivalent to
11774	** inverting a changeset using sqlite3changeset_invert() before applying it.
11775	** It is an error to specify this flag with a patchset.
11776	*/
11777	#define SQLITE_CHANGESETSTART_INVERT 0x0002
	@@ -12309,17 +12312,26 @@
12312	** Apply a changeset or patchset to a database. These functions attempt to
12313	** update the "main" database attached to handle db with the changes found in
12314	** the changeset passed via the second and third arguments.
12315	**
12316	** The fourth argument (xFilter) passed to these functions is the "filter
12317	** callback". This may be passed NULL, in which case all changes in the
12318	** changeset are applied to the database. For sqlite3changeset_apply() and
12319	** sqlite3_changeset_apply_v2(), if it is not NULL, then it is invoked once
12320	** for each table affected by at least one change in the changeset. In this
12321	** case the table name is passed as the second argument, and a copy of
12322	** the context pointer passed as the sixth argument to apply() or apply_v2()
12323	** as the first. If the "filter callback" returns zero, then no attempt is
12324	** made to apply any changes to the table. Otherwise, if the return value is
12325	** non-zero, all changes related to the table are attempted.
12326	**
12327	** For sqlite3_changeset_apply_v3(), the xFilter callback is invoked once
12328	** per change. The second argument in this case is an sqlite3_changeset_iter
12329	** that may be queried using the usual APIs for the details of the current
12330	** change. If the "filter callback" returns zero in this case, then no attempt
12331	** is made to apply the current change. If it returns non-zero, the change
12332	** is applied.
12333	**
12334	** For each table that is not excluded by the filter callback, this function
12335	** tests that the target database contains a compatible table. A table is
12336	** considered compatible if all of the following are true:
12337	**
	@@ -12336,15 +12348,15 @@
12348	** changes associated with the table are applied. A warning message is issued
12349	** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
12350	** one such warning is issued for each table in the changeset.
12351	**
12352	** For each change for which there is a compatible table, an attempt is made
12353	** to modify the table contents according to each UPDATE, INSERT or DELETE
12354	** change that is not excluded by a filter callback. If a change cannot be
12355	** applied cleanly, the conflict handler function passed as the fifth argument
12356	** to sqlite3changeset_apply() may be invoked. A description of exactly when
12357	** the conflict handler is invoked for each type of change is below.
12358	**
12359	** Unlike the xFilter argument, xConflict may not be passed NULL. The results
12360	** of passing anything other than a valid function pointer as the xConflict
12361	** argument are undefined.
12362	**
	@@ -12482,10 +12494,27 @@
12494	void pChangeset, / Changeset blob */
12495	int(*xFilter)(
12496	void pCtx, / Copy of sixth arg to _apply() */
12497	const char zTab / Table name */
12498	),
12499	int(*xConflict)(
12500	void pCtx, / Copy of sixth arg to _apply() */
12501	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12502	sqlite3_changeset_iter p / Handle describing change and conflict */
12503	),
12504	void pCtx, / First argument passed to xConflict */
12505	void *ppRebase, int pnRebase, /* OUT: Rebase data */
12506	int flags /* SESSION_CHANGESETAPPLY_* flags */
12507	);
12508	SQLITE_API int sqlite3changeset_apply_v3(
12509	sqlite3 db, / Apply change to "main" db of this handle */
12510	int nChangeset, /* Size of changeset in bytes */
12511	void pChangeset, / Changeset blob */
12512	int(*xFilter)(
12513	void pCtx, / Copy of sixth arg to _apply() */
12514	sqlite3_changeset_iter p / Handle describing change */
12515	),
12516	int(*xConflict)(
12517	void pCtx, / Copy of sixth arg to _apply() */
12518	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12519	sqlite3_changeset_iter p / Handle describing change and conflict */
12520	),
	@@ -12901,10 +12930,27 @@
12930	void pIn, / First arg for xInput */
12931	int(*xFilter)(
12932	void pCtx, / Copy of sixth arg to _apply() */
12933	const char zTab / Table name */
12934	),
12935	int(*xConflict)(
12936	void pCtx, / Copy of sixth arg to _apply() */
12937	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12938	sqlite3_changeset_iter p / Handle describing change and conflict */
12939	),
12940	void pCtx, / First argument passed to xConflict */
12941	void *ppRebase, int pnRebase,
12942	int flags
12943	);
12944	SQLITE_API int sqlite3changeset_apply_v3_strm(
12945	sqlite3 db, / Apply change to "main" db of this handle */
12946	int (xInput)(void pIn, void pData, int pnData), /* Input function */
12947	void pIn, / First arg for xInput */
12948	int(*xFilter)(
12949	void pCtx, / Copy of sixth arg to _apply() */
12950	sqlite3_changeset_iter *p
12951	),
12952	int(*xConflict)(
12953	void pCtx, / Copy of sixth arg to _apply() */
12954	int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
12955	sqlite3_changeset_iter p / Handle describing change and conflict */
12956	),
12957

M src/ajax.c

+1 -1

		--- src/ajax.c
		+++ src/ajax.c
		@@ -307,11 +307,11 @@
307	307	Blob content = empty_blob;
308	308	const char * zRenderMode = 0;
309	309
310	310	ajax_get_fnci_args( &zFilename, 0 );
311	311
312		- if(!ajax_route_bootstrap(1,1)){
	312	+ if(!ajax_route_bootstrap(0,1)){
313	313	return;
314	314	}
315	315	if(zFilename==0){
316	316	/* The filename is only used for mimetype determination,
317	317	** so we can default it... */
318	318

	--- src/ajax.c
	+++ src/ajax.c
	@@ -307,11 +307,11 @@
307	Blob content = empty_blob;
308	const char * zRenderMode = 0;
309
310	ajax_get_fnci_args( &zFilename, 0 );
311
312	if(!ajax_route_bootstrap(1,1)){
313	return;
314	}
315	if(zFilename==0){
316	/* The filename is only used for mimetype determination,
317	** so we can default it... */
318

	--- src/ajax.c
	+++ src/ajax.c
	@@ -307,11 +307,11 @@
307	Blob content = empty_blob;
308	const char * zRenderMode = 0;
309
310	ajax_get_fnci_args( &zFilename, 0 );
311
312	if(!ajax_route_bootstrap(0,1)){
313	return;
314	}
315	if(zFilename==0){
316	/* The filename is only used for mimetype determination,
317	** so we can default it... */
318

M src/cgi.c

+3 -3

		--- src/cgi.c
		+++ src/cgi.c
		@@ -505,11 +505,11 @@
505	505	&& strcmp(zContentType,"text/html")!=0
506	506	){
507	507	/* Do not cache HTML replies as those will have been generated and
508	508	** will likely, therefore, contains a nonce and we want that nonce to
509	509	** be different every time. */
510		- blob_appendf(&hdr, "ETag: %s\r\n", etag_tag());
	510	+ blob_appendf(&hdr, "ETag: \"%s\"\r\n", etag_tag());
511	511	blob_appendf(&hdr, "Cache-Control: max-age=%d\r\n", etag_maxage());
512	512	if( etag_mtime()>0 ){
513	513	blob_appendf(&hdr, "Last-Modified: %s\r\n",
514	514	cgi_rfc822_datestamp(etag_mtime()));
515	515	}
		@@ -2138,11 +2138,11 @@
2138	2138	}
2139	2139	if( fossil_strcmp(zToken,"GET")!=0
2140	2140	&& fossil_strcmp(zToken,"POST")!=0
2141	2141	&& fossil_strcmp(zToken,"HEAD")!=0
2142	2142	){
2143		- malformed_request("unsupported HTTP method: \"%s\" - Fossil only supports"
	2143	+ malformed_request("unsupported HTTP method: \"%s\" - Fossil only supports "
2144	2144	"GET, POST, and HEAD", zToken);
2145	2145	}
2146	2146	cgi_setenv("GATEWAY_INTERFACE","CGI/1.0");
2147	2147	cgi_setenv("REQUEST_METHOD",zToken);
2148	2148	zToken = extract_token(z, &z);
		@@ -2661,11 +2661,11 @@
2661	2661	listen4 = socket(AF_INET, SOCK_STREAM, 0);
2662	2662	if( listen4>0 ){
2663	2663	setsockopt(listen4, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
2664	2664	rc = bind(listen4, (struct sockaddr*)&inaddr4, sizeof(inaddr4));
2665	2665	if( rc<0 ){
2666		- close(listen6);
	2666	+ close(listen4);
2667	2667	listen4 = -1;
2668	2668	}
2669	2669	}
2670	2670	if( listen4<0 ){
2671	2671	fossil_fatal("cannot open a listening socket on %s:%d",
2672	2672

	--- src/cgi.c
	+++ src/cgi.c
	@@ -505,11 +505,11 @@
505	&& strcmp(zContentType,"text/html")!=0
506	){
507	/* Do not cache HTML replies as those will have been generated and
508	** will likely, therefore, contains a nonce and we want that nonce to
509	** be different every time. */
510	blob_appendf(&hdr, "ETag: %s\r\n", etag_tag());
511	blob_appendf(&hdr, "Cache-Control: max-age=%d\r\n", etag_maxage());
512	if( etag_mtime()>0 ){
513	blob_appendf(&hdr, "Last-Modified: %s\r\n",
514	cgi_rfc822_datestamp(etag_mtime()));
515	}
	@@ -2138,11 +2138,11 @@
2138	}
2139	if( fossil_strcmp(zToken,"GET")!=0
2140	&& fossil_strcmp(zToken,"POST")!=0
2141	&& fossil_strcmp(zToken,"HEAD")!=0
2142	){
2143	malformed_request("unsupported HTTP method: \"%s\" - Fossil only supports"
2144	"GET, POST, and HEAD", zToken);
2145	}
2146	cgi_setenv("GATEWAY_INTERFACE","CGI/1.0");
2147	cgi_setenv("REQUEST_METHOD",zToken);
2148	zToken = extract_token(z, &z);
	@@ -2661,11 +2661,11 @@
2661	listen4 = socket(AF_INET, SOCK_STREAM, 0);
2662	if( listen4>0 ){
2663	setsockopt(listen4, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
2664	rc = bind(listen4, (struct sockaddr*)&inaddr4, sizeof(inaddr4));
2665	if( rc<0 ){
2666	close(listen6);
2667	listen4 = -1;
2668	}
2669	}
2670	if( listen4<0 ){
2671	fossil_fatal("cannot open a listening socket on %s:%d",
2672

	--- src/cgi.c
	+++ src/cgi.c
	@@ -505,11 +505,11 @@
505	&& strcmp(zContentType,"text/html")!=0
506	){
507	/* Do not cache HTML replies as those will have been generated and
508	** will likely, therefore, contains a nonce and we want that nonce to
509	** be different every time. */
510	blob_appendf(&hdr, "ETag: \"%s\"\r\n", etag_tag());
511	blob_appendf(&hdr, "Cache-Control: max-age=%d\r\n", etag_maxage());
512	if( etag_mtime()>0 ){
513	blob_appendf(&hdr, "Last-Modified: %s\r\n",
514	cgi_rfc822_datestamp(etag_mtime()));
515	}
	@@ -2138,11 +2138,11 @@
2138	}
2139	if( fossil_strcmp(zToken,"GET")!=0
2140	&& fossil_strcmp(zToken,"POST")!=0
2141	&& fossil_strcmp(zToken,"HEAD")!=0
2142	){
2143	malformed_request("unsupported HTTP method: \"%s\" - Fossil only supports "
2144	"GET, POST, and HEAD", zToken);
2145	}
2146	cgi_setenv("GATEWAY_INTERFACE","CGI/1.0");
2147	cgi_setenv("REQUEST_METHOD",zToken);
2148	zToken = extract_token(z, &z);
	@@ -2661,11 +2661,11 @@
2661	listen4 = socket(AF_INET, SOCK_STREAM, 0);
2662	if( listen4>0 ){
2663	setsockopt(listen4, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
2664	rc = bind(listen4, (struct sockaddr*)&inaddr4, sizeof(inaddr4));
2665	if( rc<0 ){
2666	close(listen4);
2667	listen4 = -1;
2668	}
2669	}
2670	if( listen4<0 ){
2671	fossil_fatal("cannot open a listening socket on %s:%d",
2672

M src/clone.c

+4 -2

		--- src/clone.c
		+++ src/clone.c
		@@ -430,12 +430,14 @@
430	430	const char *zNm = db_get("short-project-name","download");
431	431	char *zUrl = href("%R/zip/%t/%t.zip", zDLTag, zNm);
432	432	@ <p>ZIP Archive: %z(zUrl)%h(zNm).zip</a>
433	433	zUrl = href("%R/tarball/%t/%t.tar.gz", zDLTag, zNm);
434	434	@ <p>Tarball: %z(zUrl)%h(zNm).tar.gz</a>
435		- zUrl = href("%R/sqlar/%t/%t.sqlar", zDLTag, zNm);
436		- @ <p>SQLite Archive: %z(zUrl)%h(zNm).sqlar</a>
	435	+ if( g.zLogin!=0 ){
	436	+ zUrl = href("%R/sqlar/%t/%t.sqlar", zDLTag, zNm);
	437	+ @ <p>SQLite Archive: %z(zUrl)%h(zNm).sqlar</a>
	438	+ }
437	439	}
438	440	if( !g.perm.Clone ){
439	441	@ <p>You are not authorized to clone this repository.
440	442	if( g.zLogin==0 \|\| g.zLogin[0]==0 ){
441	443	@ Maybe you would be able to clone if you
442	444

	--- src/clone.c
	+++ src/clone.c
	@@ -430,12 +430,14 @@
430	const char *zNm = db_get("short-project-name","download");
431	char *zUrl = href("%R/zip/%t/%t.zip", zDLTag, zNm);
432	@ <p>ZIP Archive: %z(zUrl)%h(zNm).zip</a>
433	zUrl = href("%R/tarball/%t/%t.tar.gz", zDLTag, zNm);
434	@ <p>Tarball: %z(zUrl)%h(zNm).tar.gz</a>
435	zUrl = href("%R/sqlar/%t/%t.sqlar", zDLTag, zNm);
436	@ <p>SQLite Archive: %z(zUrl)%h(zNm).sqlar</a>


437	}
438	if( !g.perm.Clone ){
439	@ <p>You are not authorized to clone this repository.
440	if( g.zLogin==0 \|\| g.zLogin[0]==0 ){
441	@ Maybe you would be able to clone if you
442

	--- src/clone.c
	+++ src/clone.c
	@@ -430,12 +430,14 @@
430	const char *zNm = db_get("short-project-name","download");
431	char *zUrl = href("%R/zip/%t/%t.zip", zDLTag, zNm);
432	@ <p>ZIP Archive: %z(zUrl)%h(zNm).zip</a>
433	zUrl = href("%R/tarball/%t/%t.tar.gz", zDLTag, zNm);
434	@ <p>Tarball: %z(zUrl)%h(zNm).tar.gz</a>
435	if( g.zLogin!=0 ){
436	zUrl = href("%R/sqlar/%t/%t.sqlar", zDLTag, zNm);
437	@ <p>SQLite Archive: %z(zUrl)%h(zNm).sqlar</a>
438	}
439	}
440	if( !g.perm.Clone ){
441	@ <p>You are not authorized to clone this repository.
442	if( g.zLogin==0 \|\| g.zLogin[0]==0 ){
443	@ Maybe you would be able to clone if you
444

M src/configure.c

		--- src/configure.c
		+++ src/configure.c
		@@ -370,10 +370,14 @@
370	370	** /user $MTIME $LOGIN pw $VALUE cap $VALUE info $VALUE photo $VALUE
371	371	** /shun $MTIME $UUID scom $VALUE
372	372	** /reportfmt $MTIME $TITLE owner $VALUE cols $VALUE sqlcode $VALUE jx $JSON
373	373	** /concealed $MTIME $HASH content $VALUE
374	374	** /subscriber $SMTIME $SEMAIL suname $V ...
	375	+**
	376	+** NAME-specific notes:
	377	+**
	378	+** - /reportftm's $MTIME is in Julian, not the Unix epoch.
375	379	*/
376	380	void configure_receive(const char zName, Blob pContent, int groupMask){
377	381	int checkMask; /* Masks for which we must first check existance of tables */
378	382
379	383	checkMask = CONFIGSET_SCRIBER;
380	384

	--- src/configure.c
	+++ src/configure.c
	@@ -370,10 +370,14 @@
370	** /user $MTIME $LOGIN pw $VALUE cap $VALUE info $VALUE photo $VALUE
371	** /shun $MTIME $UUID scom $VALUE
372	** /reportfmt $MTIME $TITLE owner $VALUE cols $VALUE sqlcode $VALUE jx $JSON
373	** /concealed $MTIME $HASH content $VALUE
374	** /subscriber $SMTIME $SEMAIL suname $V ...




375	*/
376	void configure_receive(const char zName, Blob pContent, int groupMask){
377	int checkMask; /* Masks for which we must first check existance of tables */
378
379	checkMask = CONFIGSET_SCRIBER;
380

	--- src/configure.c
	+++ src/configure.c
	@@ -370,10 +370,14 @@
370	** /user $MTIME $LOGIN pw $VALUE cap $VALUE info $VALUE photo $VALUE
371	** /shun $MTIME $UUID scom $VALUE
372	** /reportfmt $MTIME $TITLE owner $VALUE cols $VALUE sqlcode $VALUE jx $JSON
373	** /concealed $MTIME $HASH content $VALUE
374	** /subscriber $SMTIME $SEMAIL suname $V ...
375	**
376	** NAME-specific notes:
377	**
378	** - /reportftm's $MTIME is in Julian, not the Unix epoch.
379	*/
380	void configure_receive(const char zName, Blob pContent, int groupMask){
381	int checkMask; /* Masks for which we must first check existance of tables */
382
383	checkMask = CONFIGSET_SCRIBER;
384

M src/db.c

+1 -1

		--- src/db.c
		+++ src/db.c
		@@ -4758,11 +4758,11 @@
4758	4758	** SETTING: comment-format width=16 default=1
4759	4759	** Set the algorithm for printing timeline comments to the console.
4760	4760	**
4761	4761	** Possible values are:
4762	4762	** 1 Use the original comment printing algorithm:
4763		-** * Leading and trialing whitespace is removed
	4763	+** * Leading and trailing whitespace is removed
4764	4764	** * Internal whitespace is converted into a single space (0x20)
4765	4765	** * Line breaks occurs at whitespace or hyphens if possible
4766	4766	** This is the recommended value and the default.
4767	4767	**
4768	4768	** Or a bitwise combination of the following flags:
4769	4769

	--- src/db.c
	+++ src/db.c
	@@ -4758,11 +4758,11 @@
4758	** SETTING: comment-format width=16 default=1
4759	** Set the algorithm for printing timeline comments to the console.
4760	**
4761	** Possible values are:
4762	** 1 Use the original comment printing algorithm:
4763	** * Leading and trialing whitespace is removed
4764	** * Internal whitespace is converted into a single space (0x20)
4765	** * Line breaks occurs at whitespace or hyphens if possible
4766	** This is the recommended value and the default.
4767	**
4768	** Or a bitwise combination of the following flags:
4769

	--- src/db.c
	+++ src/db.c
	@@ -4758,11 +4758,11 @@
4758	** SETTING: comment-format width=16 default=1
4759	** Set the algorithm for printing timeline comments to the console.
4760	**
4761	** Possible values are:
4762	** 1 Use the original comment printing algorithm:
4763	** * Leading and trailing whitespace is removed
4764	** * Internal whitespace is converted into a single space (0x20)
4765	** * Line breaks occurs at whitespace or hyphens if possible
4766	** This is the recommended value and the default.
4767	**
4768	** Or a bitwise combination of the following flags:
4769

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -3781,11 +3781,11 @@
3781	3781	unsigned clr1, clr2, clr;
3782	3782	int bBlame = g.zPath[0]!='a';/* True for BLAME output. False for ANNOTATE. */
3783	3783
3784	3784	/* Gather query parameters */
3785	3785	login_check_credentials();
3786		- if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
	3786	+ if( !g.perm.Read \|\| g.zLogin==0 ){ login_needed(g.anon.Read); return; }
3787	3787	if( exclude_spiders(0) ) return;
3788	3788	fossil_nice_default();
3789	3789	zFilename = P("filename");
3790	3790	zRevision = PD("checkin",0);
3791	3791	zOrigin = P("origin");
3792	3792

	--- src/diff.c
	+++ src/diff.c
	@@ -3781,11 +3781,11 @@
3781	unsigned clr1, clr2, clr;
3782	int bBlame = g.zPath[0]!='a';/* True for BLAME output. False for ANNOTATE. */
3783
3784	/* Gather query parameters */
3785	login_check_credentials();
3786	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
3787	if( exclude_spiders(0) ) return;
3788	fossil_nice_default();
3789	zFilename = P("filename");
3790	zRevision = PD("checkin",0);
3791	zOrigin = P("origin");
3792

	--- src/diff.c
	+++ src/diff.c
	@@ -3781,11 +3781,11 @@
3781	unsigned clr1, clr2, clr;
3782	int bBlame = g.zPath[0]!='a';/* True for BLAME output. False for ANNOTATE. */
3783
3784	/* Gather query parameters */
3785	login_check_credentials();
3786	if( !g.perm.Read \|\| g.zLogin==0 ){ login_needed(g.anon.Read); return; }
3787	if( exclude_spiders(0) ) return;
3788	fossil_nice_default();
3789	zFilename = P("filename");
3790	zRevision = PD("checkin",0);
3791	zOrigin = P("origin");
3792

M src/diff.tcl

+7 -1

		--- src/diff.tcl
		+++ src/diff.tcl
		@@ -500,10 +500,12 @@
500	500	if {$fn==""} return
501	501	set out [open $fn wb]
502	502	puts $out "#!/usr/bin/tclsh\n#\n# Run this script using 'tclsh' or 'wish'"
503	503	puts $out "# to see the graphical diff.\n#"
504	504	puts $out "set fossilcmd {}"
	505	+ puts $out "set darkmode $::darkmode"
	506	+ puts $out "set debug $::debug"
505	507	puts $out "set prog [list $::prog]"
506	508	puts $out "set difftxt \173"
507	509	foreach e $::difftxt {puts $out [list $e]}
508	510	puts $out "\175"
509	511	puts $out "eval \$prog"
		@@ -606,11 +608,15 @@
606	608	::ttk::button .bb.quit -text {Quit} -command exit
607	609	::ttk::button .bb.reload -text {Reload} -command reloadDiff
608	610	::ttk::button .bb.invert -text {Invert} -command invertDiff
609	611	::ttk::button .bb.save -text {Save As...} -command saveDiff
610	612	::ttk::button .bb.search -text {Search} -command searchOnOff
611		-pack .bb.quit .bb.reload .bb.invert -side left
	613	+pack .bb.quit -side left
	614	+if {$fossilcmd ne ""} {
	615	+ pack .bb.reload -side left
	616	+}
	617	+pack .bb.invert -side left
612	618	if {$fossilcmd!=""} {pack .bb.save -side left}
613	619	pack .bb.files .bb.search -side left
614	620	grid rowconfigure . 1 -weight 1
615	621	grid columnconfigure . 1 -weight 1
616	622	grid columnconfigure . 4 -weight 1
617	623

	--- src/diff.tcl
	+++ src/diff.tcl
	@@ -500,10 +500,12 @@
500	if {$fn==""} return
501	set out [open $fn wb]
502	puts $out "#!/usr/bin/tclsh\n#\n# Run this script using 'tclsh' or 'wish'"
503	puts $out "# to see the graphical diff.\n#"
504	puts $out "set fossilcmd {}"


505	puts $out "set prog [list $::prog]"
506	puts $out "set difftxt \173"
507	foreach e $::difftxt {puts $out [list $e]}
508	puts $out "\175"
509	puts $out "eval \$prog"
	@@ -606,11 +608,15 @@
606	::ttk::button .bb.quit -text {Quit} -command exit
607	::ttk::button .bb.reload -text {Reload} -command reloadDiff
608	::ttk::button .bb.invert -text {Invert} -command invertDiff
609	::ttk::button .bb.save -text {Save As...} -command saveDiff
610	::ttk::button .bb.search -text {Search} -command searchOnOff
611	pack .bb.quit .bb.reload .bb.invert -side left




612	if {$fossilcmd!=""} {pack .bb.save -side left}
613	pack .bb.files .bb.search -side left
614	grid rowconfigure . 1 -weight 1
615	grid columnconfigure . 1 -weight 1
616	grid columnconfigure . 4 -weight 1
617

	--- src/diff.tcl
	+++ src/diff.tcl
	@@ -500,10 +500,12 @@
500	if {$fn==""} return
501	set out [open $fn wb]
502	puts $out "#!/usr/bin/tclsh\n#\n# Run this script using 'tclsh' or 'wish'"
503	puts $out "# to see the graphical diff.\n#"
504	puts $out "set fossilcmd {}"
505	puts $out "set darkmode $::darkmode"
506	puts $out "set debug $::debug"
507	puts $out "set prog [list $::prog]"
508	puts $out "set difftxt \173"
509	foreach e $::difftxt {puts $out [list $e]}
510	puts $out "\175"
511	puts $out "eval \$prog"
	@@ -606,11 +608,15 @@
608	::ttk::button .bb.quit -text {Quit} -command exit
609	::ttk::button .bb.reload -text {Reload} -command reloadDiff
610	::ttk::button .bb.invert -text {Invert} -command invertDiff
611	::ttk::button .bb.save -text {Save As...} -command saveDiff
612	::ttk::button .bb.search -text {Search} -command searchOnOff
613	pack .bb.quit -side left
614	if {$fossilcmd ne ""} {
615	pack .bb.reload -side left
616	}
617	pack .bb.invert -side left
618	if {$fossilcmd!=""} {pack .bb.save -side left}
619	pack .bb.files .bb.search -side left
620	grid rowconfigure . 1 -weight 1
621	grid columnconfigure . 1 -weight 1
622	grid columnconfigure . 4 -weight 1
623

M src/diffcmd.c

+2 -7

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -667,16 +667,11 @@
667	667	blob_append_escaped_arg(&cmd, blob_str(&nameFile1), 1);
668	668	blob_append_escaped_arg(&cmd, zFile2, 1);
669	669	}
670	670
671	671	/* Run the external diff command */
672		- if( fossil_system(blob_str(&cmd)) ){
673		-#if !defined(_WIN32)
674		- /* On Windows, exit codes are unreliable. */
675		- fossil_warning("External diff command failed: %b\n", &cmd);
676		-#endif
677		- }
	672	+ fossil_system(blob_str(&cmd));
678	673
679	674	/* Delete the temporary file and clean up memory used */
680	675	if( useTempfile ) file_delete(blob_str(&nameFile1));
681	676	blob_reset(&nameFile1);
682	677	blob_reset(&cmd);
		@@ -1295,11 +1290,11 @@
1295	1290	**
1296	1291	** Show the difference between the current version of each of the FILEs
1297	1292	** specified (as they exist on disk) and that same file as it was checked-
1298	1293	** out. Or if the FILE arguments are omitted, show all unsaved changes
1299	1294	** currently in the working check-out. The "gdiff" variant means to
1300		-** to use a GUI diff.
	1295	+** use a GUI diff.
1301	1296	**
1302	1297	** The default output format is a "unified patch" (the same as the
1303	1298	** output of "diff -u" on most unix systems). Many alternative formats
1304	1299	** are available. A few of the more useful alternatives:
1305	1300	**
1306	1301

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -667,16 +667,11 @@
667	blob_append_escaped_arg(&cmd, blob_str(&nameFile1), 1);
668	blob_append_escaped_arg(&cmd, zFile2, 1);
669	}
670
671	/* Run the external diff command */
672	if( fossil_system(blob_str(&cmd)) ){
673	#if !defined(_WIN32)
674	/* On Windows, exit codes are unreliable. */
675	fossil_warning("External diff command failed: %b\n", &cmd);
676	#endif
677	}
678
679	/* Delete the temporary file and clean up memory used */
680	if( useTempfile ) file_delete(blob_str(&nameFile1));
681	blob_reset(&nameFile1);
682	blob_reset(&cmd);
	@@ -1295,11 +1290,11 @@
1295	**
1296	** Show the difference between the current version of each of the FILEs
1297	** specified (as they exist on disk) and that same file as it was checked-
1298	** out. Or if the FILE arguments are omitted, show all unsaved changes
1299	** currently in the working check-out. The "gdiff" variant means to
1300	** to use a GUI diff.
1301	**
1302	** The default output format is a "unified patch" (the same as the
1303	** output of "diff -u" on most unix systems). Many alternative formats
1304	** are available. A few of the more useful alternatives:
1305	**
1306

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -667,16 +667,11 @@
667	blob_append_escaped_arg(&cmd, blob_str(&nameFile1), 1);
668	blob_append_escaped_arg(&cmd, zFile2, 1);
669	}
670
671	/* Run the external diff command */
672	fossil_system(blob_str(&cmd));





673
674	/* Delete the temporary file and clean up memory used */
675	if( useTempfile ) file_delete(blob_str(&nameFile1));
676	blob_reset(&nameFile1);
677	blob_reset(&cmd);
	@@ -1295,11 +1290,11 @@
1290	**
1291	** Show the difference between the current version of each of the FILEs
1292	** specified (as they exist on disk) and that same file as it was checked-
1293	** out. Or if the FILE arguments are omitted, show all unsaved changes
1294	** currently in the working check-out. The "gdiff" variant means to
1295	** use a GUI diff.
1296	**
1297	** The default output format is a "unified patch" (the same as the
1298	** output of "diff -u" on most unix systems). Many alternative formats
1299	** are available. A few of the more useful alternatives:
1300	**
1301

M src/etag.c

+11 -3

		--- src/etag.c
		+++ src/etag.c
		@@ -94,10 +94,12 @@
94	94	** Generate an ETag
95	95	*/
96	96	void etag_check(unsigned eFlags, const char *zHash){
97	97	const char *zIfNoneMatch;
98	98	char zBuf[50];
	99	+ const int cchETag = 32; /* Not including NULL terminator. */
	100	+ int cch; /* Length of zIfNoneMatch header. */
99	101	assert( zETag[0]==0 ); /* Only call this routine once! */
100	102
101	103	if( etagCancelled ) return;
102	104
103	105	/* By default, ETagged URLs never expire since the ETag will change
		@@ -157,17 +159,23 @@
157	159	md5sum_step_text("\n", 1);
158	160	}
159	161	}
160	162
161	163	/* Generate the ETag */
162		- memcpy(zETag, md5sum_finish(0), 33);
	164	+ memcpy(zETag, md5sum_finish(0), cchETag+1);
163	165
164	166	/* Check to see if the generated ETag matches If-None-Match and
165		- ** generate a 304 reply if it does. */
	167	+ ** generate a 304 reply if it does. Test both with and without
	168	+ ** double quotes. */
166	169	zIfNoneMatch = P("HTTP_IF_NONE_MATCH");
167	170	if( zIfNoneMatch==0 ) return;
168		- if( strcmp(zIfNoneMatch,zETag)!=0 ) return;
	171	+ cch = strlen(zIfNoneMatch);
	172	+ if( cch==cchETag+2 && zIfNoneMatch[0]=='"' && zIfNoneMatch[cch-1]=='"' ){
	173	+ if( memcmp(&zIfNoneMatch[1],zETag,cchETag)!=0 ) return;
	174	+ }else{
	175	+ if( strcmp(zIfNoneMatch,zETag)!=0 ) return;
	176	+ }
169	177
170	178	/* If we get this far, it means that the content has
171	179	** not changed and we can do a 304 reply */
172	180	cgi_reset_content();
173	181	cgi_set_status(304, "Not Modified");
174	182

	--- src/etag.c
	+++ src/etag.c
	@@ -94,10 +94,12 @@
94	** Generate an ETag
95	*/
96	void etag_check(unsigned eFlags, const char *zHash){
97	const char *zIfNoneMatch;
98	char zBuf[50];


99	assert( zETag[0]==0 ); /* Only call this routine once! */
100
101	if( etagCancelled ) return;
102
103	/* By default, ETagged URLs never expire since the ETag will change
	@@ -157,17 +159,23 @@
157	md5sum_step_text("\n", 1);
158	}
159	}
160
161	/* Generate the ETag */
162	memcpy(zETag, md5sum_finish(0), 33);
163
164	/* Check to see if the generated ETag matches If-None-Match and
165	** generate a 304 reply if it does. */

166	zIfNoneMatch = P("HTTP_IF_NONE_MATCH");
167	if( zIfNoneMatch==0 ) return;
168	if( strcmp(zIfNoneMatch,zETag)!=0 ) return;





169
170	/* If we get this far, it means that the content has
171	** not changed and we can do a 304 reply */
172	cgi_reset_content();
173	cgi_set_status(304, "Not Modified");
174

	--- src/etag.c
	+++ src/etag.c
	@@ -94,10 +94,12 @@
94	** Generate an ETag
95	*/
96	void etag_check(unsigned eFlags, const char *zHash){
97	const char *zIfNoneMatch;
98	char zBuf[50];
99	const int cchETag = 32; /* Not including NULL terminator. */
100	int cch; /* Length of zIfNoneMatch header. */
101	assert( zETag[0]==0 ); /* Only call this routine once! */
102
103	if( etagCancelled ) return;
104
105	/* By default, ETagged URLs never expire since the ETag will change
	@@ -157,17 +159,23 @@
159	md5sum_step_text("\n", 1);
160	}
161	}
162
163	/* Generate the ETag */
164	memcpy(zETag, md5sum_finish(0), cchETag+1);
165
166	/* Check to see if the generated ETag matches If-None-Match and
167	** generate a 304 reply if it does. Test both with and without
168	** double quotes. */
169	zIfNoneMatch = P("HTTP_IF_NONE_MATCH");
170	if( zIfNoneMatch==0 ) return;
171	cch = strlen(zIfNoneMatch);
172	if( cch==cchETag+2 && zIfNoneMatch[0]=='"' && zIfNoneMatch[cch-1]=='"' ){
173	if( memcmp(&zIfNoneMatch[1],zETag,cchETag)!=0 ) return;
174	}else{
175	if( strcmp(zIfNoneMatch,zETag)!=0 ) return;
176	}
177
178	/* If we get this far, it means that the content has
179	** not changed and we can do a 304 reply */
180	cgi_reset_content();
181	cgi_set_status(304, "Not Modified");
182

M src/forum.c

+4 -2

		--- src/forum.c
		+++ src/forum.c
		@@ -933,11 +933,12 @@
933	933	@ <form method="post" \
934	934	@ action='%R/forumpost_%s(iClosed > 0 ? "reopen" : "close")'>
935	935	login_insert_csrf_secret();
936	936	@ <input type="hidden" name="fpid" value="%z(rid_to_uuid(iHead))" />
937	937	if( moderation_pending(p->fpid)==0 ){
938		- @ <input type="submit" value='%s(iClosed ? "Re-open" : "Close")' />
	938	+ @ <input type="button" value='%s(iClosed ? "Re-open" : "Close")' \
	939	+ @ class='%s(iClosed ? "action-reopen" : "action-close")'/>
939	940	}
940	941	@ </form>
941	942	}
942	943	@ </div>
943	944	}
		@@ -1114,11 +1115,12 @@
1114	1115	** Emit Forum Javascript which applies (or optionally can apply)
1115	1116	** to all forum-related pages. It does not include page-specific
1116	1117	** code (e.g. "forum.js").
1117	1118	*/
1118	1119	static void forum_emit_js(void){
1119		- builtin_fossil_js_bundle_or("copybutton", "pikchr", NULL);
	1120	+ builtin_fossil_js_bundle_or("copybutton", "pikchr", "confirmer",
	1121	+ NULL);
1120	1122	builtin_request_js("fossil.page.forumpost.js");
1121	1123	}
1122	1124
1123	1125	/*
1124	1126	** WEBPAGE: forumpost
1125	1127

	--- src/forum.c
	+++ src/forum.c
	@@ -933,11 +933,12 @@
933	@ <form method="post" \
934	@ action='%R/forumpost_%s(iClosed > 0 ? "reopen" : "close")'>
935	login_insert_csrf_secret();
936	@ <input type="hidden" name="fpid" value="%z(rid_to_uuid(iHead))" />
937	if( moderation_pending(p->fpid)==0 ){
938	@ <input type="submit" value='%s(iClosed ? "Re-open" : "Close")' />

939	}
940	@ </form>
941	}
942	@ </div>
943	}
	@@ -1114,11 +1115,12 @@
1114	** Emit Forum Javascript which applies (or optionally can apply)
1115	** to all forum-related pages. It does not include page-specific
1116	** code (e.g. "forum.js").
1117	*/
1118	static void forum_emit_js(void){
1119	builtin_fossil_js_bundle_or("copybutton", "pikchr", NULL);

1120	builtin_request_js("fossil.page.forumpost.js");
1121	}
1122
1123	/*
1124	** WEBPAGE: forumpost
1125

	--- src/forum.c
	+++ src/forum.c
	@@ -933,11 +933,12 @@
933	@ <form method="post" \
934	@ action='%R/forumpost_%s(iClosed > 0 ? "reopen" : "close")'>
935	login_insert_csrf_secret();
936	@ <input type="hidden" name="fpid" value="%z(rid_to_uuid(iHead))" />
937	if( moderation_pending(p->fpid)==0 ){
938	@ <input type="button" value='%s(iClosed ? "Re-open" : "Close")' \
939	@ class='%s(iClosed ? "action-reopen" : "action-close")'/>
940	}
941	@ </form>
942	}
943	@ </div>
944	}
	@@ -1114,11 +1115,12 @@
1115	** Emit Forum Javascript which applies (or optionally can apply)
1116	** to all forum-related pages. It does not include page-specific
1117	** code (e.g. "forum.js").
1118	*/
1119	static void forum_emit_js(void){
1120	builtin_fossil_js_bundle_or("copybutton", "pikchr", "confirmer",
1121	NULL);
1122	builtin_request_js("fossil.page.forumpost.js");
1123	}
1124
1125	/*
1126	** WEBPAGE: forumpost
1127

M src/fossil.numbered-lines.js

+1 -4

		--- src/fossil.numbered-lines.js
		+++ src/fossil.numbered-lines.js
		@@ -21,14 +21,11 @@
21	21	const tdLn = tbl.querySelector('td.line-numbers');
22	22	const urlArgsRaw = (window.location.search\|\|'?')
23	23	.replace(/&?\budc=[^&]/,'') / "update display prefs cookie" */
24	24	.replace(/&?\bln=[^&]/,'') / inbound line number/range */
25	25	.replace('?&','?');
26		- var urlArgsDecoded = urlArgsRaw;
27		- try{urlArgsDecoded = decodeURIComponent(urlArgsRaw);}
28		- catch{}
29		- const lineState = { urlArgs: urlArgsDecoded, start: 0, end: 0 };
	26	+ const lineState = { urlArgs: urlArgsRaw, start: 0, end: 0 };
30	27	const lineTip = new F.PopupWidget({
31	28	style: {
32	29	cursor: 'pointer'
33	30	},
34	31	refresh: function(){
35	32

	--- src/fossil.numbered-lines.js
	+++ src/fossil.numbered-lines.js
	@@ -21,14 +21,11 @@
21	const tdLn = tbl.querySelector('td.line-numbers');
22	const urlArgsRaw = (window.location.search\|\|'?')
23	.replace(/&?\budc=[^&]/,'') / "update display prefs cookie" */
24	.replace(/&?\bln=[^&]/,'') / inbound line number/range */
25	.replace('?&','?');
26	var urlArgsDecoded = urlArgsRaw;
27	try{urlArgsDecoded = decodeURIComponent(urlArgsRaw);}
28	catch{}
29	const lineState = { urlArgs: urlArgsDecoded, start: 0, end: 0 };
30	const lineTip = new F.PopupWidget({
31	style: {
32	cursor: 'pointer'
33	},
34	refresh: function(){
35

	--- src/fossil.numbered-lines.js
	+++ src/fossil.numbered-lines.js
	@@ -21,14 +21,11 @@
21	const tdLn = tbl.querySelector('td.line-numbers');
22	const urlArgsRaw = (window.location.search\|\|'?')
23	.replace(/&?\budc=[^&]/,'') / "update display prefs cookie" */
24	.replace(/&?\bln=[^&]/,'') / inbound line number/range */
25	.replace('?&','?');
26	const lineState = { urlArgs: urlArgsRaw, start: 0, end: 0 };



27	const lineTip = new F.PopupWidget({
28	style: {
29	cursor: 'pointer'
30	},
31	refresh: function(){
32

M src/fossil.page.forumpost.js

+11

		--- src/fossil.page.forumpost.js
		+++ src/fossil.page.forumpost.js
		@@ -117,8 +117,19 @@
117	117	setTimeout(()=>{delete form.dataset.submitted}, 7000);
118	118	return;
119	119	};
120	120	document.querySelectorAll("form").forEach(function(form){
121	121	form.addEventListener('submit',formSubmitted);
	122	+ form
	123	+ .querySelectorAll("input.action-close, input.action-reopen")
	124	+ .forEach(function(e){
	125	+ F.confirmer(e, {
	126	+ confirmText: (e.classList.contains('action-reopen')
	127	+ ? "Confirm re-open"
	128	+ : "Confirm close"),
	129	+ onconfirm: ()=>form.submit()
	130	+ });
	131	+ });
122	132	});
	133	+
123	134	})/F.onPageLoad callback/;
124	135	})(window.fossil);
125	136

	--- src/fossil.page.forumpost.js
	+++ src/fossil.page.forumpost.js
	@@ -117,8 +117,19 @@
117	setTimeout(()=>{delete form.dataset.submitted}, 7000);
118	return;
119	};
120	document.querySelectorAll("form").forEach(function(form){
121	form.addEventListener('submit',formSubmitted);










122	});

123	})/F.onPageLoad callback/;
124	})(window.fossil);
125

	--- src/fossil.page.forumpost.js
	+++ src/fossil.page.forumpost.js
	@@ -117,8 +117,19 @@
117	setTimeout(()=>{delete form.dataset.submitted}, 7000);
118	return;
119	};
120	document.querySelectorAll("form").forEach(function(form){
121	form.addEventListener('submit',formSubmitted);
122	form
123	.querySelectorAll("input.action-close, input.action-reopen")
124	.forEach(function(e){
125	F.confirmer(e, {
126	confirmText: (e.classList.contains('action-reopen')
127	? "Confirm re-open"
128	: "Confirm close"),
129	onconfirm: ()=>form.submit()
130	});
131	});
132	});
133
134	})/F.onPageLoad callback/;
135	})(window.fossil);
136

M src/http.c

+3 -2

		--- src/http.c
		+++ src/http.c
		@@ -52,11 +52,12 @@
52	52	** Construct the "login" card with the client credentials.
53	53	**
54	54	** login LOGIN NONCE SIGNATURE
55	55	**
56	56	** The LOGIN is the user id of the client. NONCE is the sha1 checksum
57		-** of all payload that follows the login card. SIGNATURE is the sha1
	57	+** of all payload that follows the login card. Randomness for the NONCE
	58	+** must be provided in the payload (in xfer.c). SIGNATURE is the sha1
58	59	** checksum of the nonce followed by the user password.
59	60	**
60	61	** Write the constructed login card into pLogin. pLogin is initialized
61	62	** by this routine.
62	63	*/
		@@ -764,11 +765,11 @@
764	765	** COMMAND: test-httpmsg
765	766	**
766	767	** Usage: %fossil test-httpmsg ?OPTIONS? URL ?PAYLOAD? ?OUTPUT?
767	768	**
768	769	** Send an HTTP message to URL and get the reply. PAYLOAD is a file containing
769		-** the payload, or "-" to read payload from standard input. a POST message
	770	+** the payload, or "-" to read payload from standard input. A POST message
770	771	** is sent if PAYLOAD is specified and is non-empty. If PAYLOAD is omitted
771	772	** or is an empty file, then a GET message is sent.
772	773	**
773	774	** If a second filename (OUTPUT) is given after PAYLOAD, then the reply
774	775	** is written into that second file instead of being written on standard
775	776

	--- src/http.c
	+++ src/http.c
	@@ -52,11 +52,12 @@
52	** Construct the "login" card with the client credentials.
53	**
54	** login LOGIN NONCE SIGNATURE
55	**
56	** The LOGIN is the user id of the client. NONCE is the sha1 checksum
57	** of all payload that follows the login card. SIGNATURE is the sha1

58	** checksum of the nonce followed by the user password.
59	**
60	** Write the constructed login card into pLogin. pLogin is initialized
61	** by this routine.
62	*/
	@@ -764,11 +765,11 @@
764	** COMMAND: test-httpmsg
765	**
766	** Usage: %fossil test-httpmsg ?OPTIONS? URL ?PAYLOAD? ?OUTPUT?
767	**
768	** Send an HTTP message to URL and get the reply. PAYLOAD is a file containing
769	** the payload, or "-" to read payload from standard input. a POST message
770	** is sent if PAYLOAD is specified and is non-empty. If PAYLOAD is omitted
771	** or is an empty file, then a GET message is sent.
772	**
773	** If a second filename (OUTPUT) is given after PAYLOAD, then the reply
774	** is written into that second file instead of being written on standard
775

	--- src/http.c
	+++ src/http.c
	@@ -52,11 +52,12 @@
52	** Construct the "login" card with the client credentials.
53	**
54	** login LOGIN NONCE SIGNATURE
55	**
56	** The LOGIN is the user id of the client. NONCE is the sha1 checksum
57	** of all payload that follows the login card. Randomness for the NONCE
58	** must be provided in the payload (in xfer.c). SIGNATURE is the sha1
59	** checksum of the nonce followed by the user password.
60	**
61	** Write the constructed login card into pLogin. pLogin is initialized
62	** by this routine.
63	*/
	@@ -764,11 +765,11 @@
765	** COMMAND: test-httpmsg
766	**
767	** Usage: %fossil test-httpmsg ?OPTIONS? URL ?PAYLOAD? ?OUTPUT?
768	**
769	** Send an HTTP message to URL and get the reply. PAYLOAD is a file containing
770	** the payload, or "-" to read payload from standard input. A POST message
771	** is sent if PAYLOAD is specified and is non-empty. If PAYLOAD is omitted
772	** or is an empty file, then a GET message is sent.
773	**
774	** If a second filename (OUTPUT) is given after PAYLOAD, then the reply
775	** is written into that second file instead of being written on standard
776

M src/info.c

+6 -2

		--- src/info.c
		+++ src/info.c
		@@ -993,12 +993,14 @@
993	993	}
994	994	zUrl = mprintf("%R/tarball/%S/%t-%S.tar.gz", zUuid, zPJ, zUuid);
995	995	@ <tr><th>Downloads:</th><td>
996	996	@ %z(href("%s",zUrl))Tarball</a>
997	997	@ \| %z(href("%R/zip/%S/%t-%S.zip",zUuid, zPJ,zUuid))ZIP archive</a>
998		- @ \| %z(href("%R/sqlar/%S/%t-%S.sqlar",zUuid,zPJ,zUuid))\
999		- @ SQL archive</a></td></tr>
	998	+ if( g.zLogin!=0 ){
	999	+ @ \| %z(href("%R/sqlar/%S/%t-%S.sqlar",zUuid,zPJ,zUuid))\
	1000	+ @ SQL archive</a></td></tr>
	1001	+ }
1000	1002	fossil_free(zUrl);
1001	1003	blob_reset(&projName);
1002	1004	}
1003	1005
1004	1006	@ <tr><th>Timelines:</th><td>
		@@ -3930,10 +3932,11 @@
3930	3932	** --cancel TAG Cancel TAG from this check-in
3931	3933	** --close Mark this "leaf" as closed
3932	3934	** --date DATETIME Make DATETIME the check-in time
3933	3935	** --date-override DATETIME Set the change time on the control artifact
3934	3936	** -e\|--edit-comment Launch editor to revise comment
	3937	+** --editor NAME Text editor to use for check-in comment
3935	3938	** --hide Hide branch starting from this check-in
3936	3939	** -m\|--comment COMMENT Make COMMENT the check-in comment
3937	3940	** -M\|--message-file FILE Read the amended comment from FILE
3938	3941	** -n\|--dry-run Print control artifact, but make no changes
3939	3942	** --no-verify-comment Do not validate the check-in comment
		@@ -4003,10 +4006,11 @@
4003	4006	if( zChngTime==0 ) zChngTime = find_option("chngtime",0,1);
4004	4007	zUserOvrd = find_option("user-override",0,1);
4005	4008	noVerifyCom = find_option("no-verify-comment",0,0)!=0;
4006	4009	db_find_and_open_repository(0,0);
4007	4010	user_select();
	4011	+ (void)fossil_text_editor();
4008	4012	verify_all_options();
4009	4013	if( g.argc<3 \|\| g.argc>=4 ) usage(AMEND_USAGE_STMT);
4010	4014	rid = name_to_typed_rid(g.argv[2], "ci");
4011	4015	if( rid==0 && !is_a_version(rid) ) fossil_fatal("no such check-in");
4012	4016	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
4013	4017

	--- src/info.c
	+++ src/info.c
	@@ -993,12 +993,14 @@
993	}
994	zUrl = mprintf("%R/tarball/%S/%t-%S.tar.gz", zUuid, zPJ, zUuid);
995	@ <tr><th>Downloads:</th><td>
996	@ %z(href("%s",zUrl))Tarball</a>
997	@ \| %z(href("%R/zip/%S/%t-%S.zip",zUuid, zPJ,zUuid))ZIP archive</a>
998	@ \| %z(href("%R/sqlar/%S/%t-%S.sqlar",zUuid,zPJ,zUuid))\
999	@ SQL archive</a></td></tr>


1000	fossil_free(zUrl);
1001	blob_reset(&projName);
1002	}
1003
1004	@ <tr><th>Timelines:</th><td>
	@@ -3930,10 +3932,11 @@
3930	** --cancel TAG Cancel TAG from this check-in
3931	** --close Mark this "leaf" as closed
3932	** --date DATETIME Make DATETIME the check-in time
3933	** --date-override DATETIME Set the change time on the control artifact
3934	** -e\|--edit-comment Launch editor to revise comment

3935	** --hide Hide branch starting from this check-in
3936	** -m\|--comment COMMENT Make COMMENT the check-in comment
3937	** -M\|--message-file FILE Read the amended comment from FILE
3938	** -n\|--dry-run Print control artifact, but make no changes
3939	** --no-verify-comment Do not validate the check-in comment
	@@ -4003,10 +4006,11 @@
4003	if( zChngTime==0 ) zChngTime = find_option("chngtime",0,1);
4004	zUserOvrd = find_option("user-override",0,1);
4005	noVerifyCom = find_option("no-verify-comment",0,0)!=0;
4006	db_find_and_open_repository(0,0);
4007	user_select();

4008	verify_all_options();
4009	if( g.argc<3 \|\| g.argc>=4 ) usage(AMEND_USAGE_STMT);
4010	rid = name_to_typed_rid(g.argv[2], "ci");
4011	if( rid==0 && !is_a_version(rid) ) fossil_fatal("no such check-in");
4012	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
4013

	--- src/info.c
	+++ src/info.c
	@@ -993,12 +993,14 @@
993	}
994	zUrl = mprintf("%R/tarball/%S/%t-%S.tar.gz", zUuid, zPJ, zUuid);
995	@ <tr><th>Downloads:</th><td>
996	@ %z(href("%s",zUrl))Tarball</a>
997	@ \| %z(href("%R/zip/%S/%t-%S.zip",zUuid, zPJ,zUuid))ZIP archive</a>
998	if( g.zLogin!=0 ){
999	@ \| %z(href("%R/sqlar/%S/%t-%S.sqlar",zUuid,zPJ,zUuid))\
1000	@ SQL archive</a></td></tr>
1001	}
1002	fossil_free(zUrl);
1003	blob_reset(&projName);
1004	}
1005
1006	@ <tr><th>Timelines:</th><td>
	@@ -3930,10 +3932,11 @@
3932	** --cancel TAG Cancel TAG from this check-in
3933	** --close Mark this "leaf" as closed
3934	** --date DATETIME Make DATETIME the check-in time
3935	** --date-override DATETIME Set the change time on the control artifact
3936	** -e\|--edit-comment Launch editor to revise comment
3937	** --editor NAME Text editor to use for check-in comment
3938	** --hide Hide branch starting from this check-in
3939	** -m\|--comment COMMENT Make COMMENT the check-in comment
3940	** -M\|--message-file FILE Read the amended comment from FILE
3941	** -n\|--dry-run Print control artifact, but make no changes
3942	** --no-verify-comment Do not validate the check-in comment
	@@ -4003,10 +4006,11 @@
4006	if( zChngTime==0 ) zChngTime = find_option("chngtime",0,1);
4007	zUserOvrd = find_option("user-override",0,1);
4008	noVerifyCom = find_option("no-verify-comment",0,0)!=0;
4009	db_find_and_open_repository(0,0);
4010	user_select();
4011	(void)fossil_text_editor();
4012	verify_all_options();
4013	if( g.argc<3 \|\| g.argc>=4 ) usage(AMEND_USAGE_STMT);
4014	rid = name_to_typed_rid(g.argv[2], "ci");
4015	if( rid==0 && !is_a_version(rid) ) fossil_fatal("no such check-in");
4016	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
4017

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -3113,11 +3113,11 @@
3113	3113	**
3114	3114	** echo 'GET /timeline' >request.txt
3115	3115	**
3116	3116	** Then run (in a debugger) a command like this:
3117	3117	**
3118		-** fossil test-http --debug <request.txt
	3118	+** fossil test-http <request.txt
3119	3119	**
3120	3120	** This command is also used internally by the "ssh" sync protocol. Some
3121	3121	** special processing to support sync happens when this command is run
3122	3122	** and the SSH_CONNECTION environment variable is set. Use the --test
3123	3123	** option on interactive sessions to avoid that special processing when
3124	3124

	--- src/main.c
	+++ src/main.c
	@@ -3113,11 +3113,11 @@
3113	**
3114	** echo 'GET /timeline' >request.txt
3115	**
3116	** Then run (in a debugger) a command like this:
3117	**
3118	** fossil test-http --debug <request.txt
3119	**
3120	** This command is also used internally by the "ssh" sync protocol. Some
3121	** special processing to support sync happens when this command is run
3122	** and the SSH_CONNECTION environment variable is set. Use the --test
3123	** option on interactive sessions to avoid that special processing when
3124

	--- src/main.c
	+++ src/main.c
	@@ -3113,11 +3113,11 @@
3113	**
3114	** echo 'GET /timeline' >request.txt
3115	**
3116	** Then run (in a debugger) a command like this:
3117	**
3118	** fossil test-http <request.txt
3119	**
3120	** This command is also used internally by the "ssh" sync protocol. Some
3121	** special processing to support sync happens when this command is run
3122	** and the SSH_CONNECTION environment variable is set. Use the --test
3123	** option on interactive sessions to avoid that special processing when
3124

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -3113,11 +3113,11 @@
3113	3113	**
3114	3114	** echo 'GET /timeline' >request.txt
3115	3115	**
3116	3116	** Then run (in a debugger) a command like this:
3117	3117	**
3118		-** fossil test-http --debug <request.txt
	3118	+** fossil test-http <request.txt
3119	3119	**
3120	3120	** This command is also used internally by the "ssh" sync protocol. Some
3121	3121	** special processing to support sync happens when this command is run
3122	3122	** and the SSH_CONNECTION environment variable is set. Use the --test
3123	3123	** option on interactive sessions to avoid that special processing when
3124	3124

	--- src/main.c
	+++ src/main.c
	@@ -3113,11 +3113,11 @@
3113	**
3114	** echo 'GET /timeline' >request.txt
3115	**
3116	** Then run (in a debugger) a command like this:
3117	**
3118	** fossil test-http --debug <request.txt
3119	**
3120	** This command is also used internally by the "ssh" sync protocol. Some
3121	** special processing to support sync happens when this command is run
3122	** and the SSH_CONNECTION environment variable is set. Use the --test
3123	** option on interactive sessions to avoid that special processing when
3124

	--- src/main.c
	+++ src/main.c
	@@ -3113,11 +3113,11 @@
3113	**
3114	** echo 'GET /timeline' >request.txt
3115	**
3116	** Then run (in a debugger) a command like this:
3117	**
3118	** fossil test-http <request.txt
3119	**
3120	** This command is also used internally by the "ssh" sync protocol. Some
3121	** special processing to support sync happens when this command is run
3122	** and the SSH_CONNECTION environment variable is set. Use the --test
3123	** option on interactive sessions to avoid that special processing when
3124

M src/main.mk

+17 -7

		--- src/main.mk
		+++ src/main.mk
		@@ -578,39 +578,41 @@
578	578	$(OBJDIR)/winfile.o \
579	579	$(OBJDIR)/winhttp.o \
580	580	$(OBJDIR)/xfer.o \
581	581	$(OBJDIR)/xfersetup.o \
582	582	$(OBJDIR)/zip.o
583		-all: $(OBJDIR) $(APPNAME)
	583	+all: $(APPNAME)
584	584
585	585	install: all
586	586	mkdir -p $(INSTALLDIR)
587	587	cp $(APPNAME) $(INSTALLDIR)
588	588
589	589	codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
590	590	$(OBJDIR)/codecheck1 $(TRANS_SRC)
591	591
592		-$(OBJDIR):
593		- -mkdir $(OBJDIR)
594		-
595	592	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
596	593	-mkdir -p $(OBJDIR)
597	594	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
598	595
599	596	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
	597	+ -mkdir -p $(OBJDIR)
600	598	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
601	599
602	600	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
	601	+ -mkdir -p $(OBJDIR)
603	602	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
604	603
605	604	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
	605	+ -mkdir -p $(OBJDIR)
606	606	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
607	607
608	608	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
	609	+ -mkdir -p $(OBJDIR)
609	610	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
610	611
611	612	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
	613	+ -mkdir -p $(OBJDIR)
612	614	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
613	615
614	616	# Run the test suite.
615	617	# Other flags that can be included in TESTFLAGS are:
616	618	#
		@@ -622,11 +624,11 @@
622	624	# -strict Treat known bugs as failures
623	625	#
624	626	# TESTFLAGS can also include names of specific test files to limit
625	627	# the run to just those test cases.
626	628	#
627		-test: $(OBJDIR) $(APPNAME)
	629	+test: $(APPNAME)
628	630	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
629	631
630	632	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
631	633	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
632	634	$(SRCDIR)/../manifest \
		@@ -653,10 +655,11 @@
653	655	-DSQLITE_ENABLE_DBSTAT_VTAB \
654	656	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
655	657	-DSQLITE_ENABLE_FTS4 \
656	658	-DSQLITE_ENABLE_FTS5 \
657	659	-DSQLITE_ENABLE_MATH_FUNCTIONS \
	660	+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
658	661	-DSQLITE_ENABLE_STMTVTAB \
659	662	-DSQLITE_HAVE_ZLIB \
660	663	-DSQLITE_ENABLE_DBPAGE_VTAB \
661	664	-DSQLITE_TRUSTED_SCHEMA=0 \
662	665	-DHAVE_USLEEP
		@@ -679,10 +682,11 @@
679	682	-DSQLITE_ENABLE_DBSTAT_VTAB \
680	683	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
681	684	-DSQLITE_ENABLE_FTS4 \
682	685	-DSQLITE_ENABLE_FTS5 \
683	686	-DSQLITE_ENABLE_MATH_FUNCTIONS \
	687	+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
684	688	-DSQLITE_ENABLE_STMTVTAB \
685	689	-DSQLITE_HAVE_ZLIB \
686	690	-DSQLITE_ENABLE_DBPAGE_VTAB \
687	691	-DSQLITE_TRUSTED_SCHEMA=0 \
688	692	-DHAVE_USLEEP \
		@@ -2119,23 +2123,29 @@
2119	2123
2120	2124	$(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
2121	2125	$(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2122	2126
2123	2127	$(OBJDIR)/th.o: $(SRCDIR)/th.c
	2128	+ -mkdir -p $(OBJDIR)
	2129	+
2124	2130	$(XTCC) -c $(SRCDIR)/th.c -o $@
2125	2131
2126	2132	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
	2133	+ -mkdir -p $(OBJDIR)
	2134	+
2127	2135	$(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2128	2136
2129	2137	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
	2138	+ -mkdir -p $(OBJDIR)
	2139	+
2130	2140	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2131	2141
2132	2142
2133		-$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
	2143	+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
2134	2144	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2135	2145
2136		-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
	2146	+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
2137	2147	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2138	2148
2139	2149	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2140	2150	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2141	2151	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
2142	2152

	--- src/main.mk
	+++ src/main.mk
	@@ -578,39 +578,41 @@
578	$(OBJDIR)/winfile.o \
579	$(OBJDIR)/winhttp.o \
580	$(OBJDIR)/xfer.o \
581	$(OBJDIR)/xfersetup.o \
582	$(OBJDIR)/zip.o
583	all: $(OBJDIR) $(APPNAME)
584
585	install: all
586	mkdir -p $(INSTALLDIR)
587	cp $(APPNAME) $(INSTALLDIR)
588
589	codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
590	$(OBJDIR)/codecheck1 $(TRANS_SRC)
591
592	$(OBJDIR):
593	-mkdir $(OBJDIR)
594
595	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
596	-mkdir -p $(OBJDIR)
597	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
598
599	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c

600	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
601
602	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c

603	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
604
605	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c

606	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
607
608	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c

609	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
610
611	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c

612	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
613
614	# Run the test suite.
615	# Other flags that can be included in TESTFLAGS are:
616	#
	@@ -622,11 +624,11 @@
622	# -strict Treat known bugs as failures
623	#
624	# TESTFLAGS can also include names of specific test files to limit
625	# the run to just those test cases.
626	#
627	test: $(OBJDIR) $(APPNAME)
628	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
629
630	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
631	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
632	$(SRCDIR)/../manifest \
	@@ -653,10 +655,11 @@
653	-DSQLITE_ENABLE_DBSTAT_VTAB \
654	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
655	-DSQLITE_ENABLE_FTS4 \
656	-DSQLITE_ENABLE_FTS5 \
657	-DSQLITE_ENABLE_MATH_FUNCTIONS \

658	-DSQLITE_ENABLE_STMTVTAB \
659	-DSQLITE_HAVE_ZLIB \
660	-DSQLITE_ENABLE_DBPAGE_VTAB \
661	-DSQLITE_TRUSTED_SCHEMA=0 \
662	-DHAVE_USLEEP
	@@ -679,10 +682,11 @@
679	-DSQLITE_ENABLE_DBSTAT_VTAB \
680	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
681	-DSQLITE_ENABLE_FTS4 \
682	-DSQLITE_ENABLE_FTS5 \
683	-DSQLITE_ENABLE_MATH_FUNCTIONS \

684	-DSQLITE_ENABLE_STMTVTAB \
685	-DSQLITE_HAVE_ZLIB \
686	-DSQLITE_ENABLE_DBPAGE_VTAB \
687	-DSQLITE_TRUSTED_SCHEMA=0 \
688	-DHAVE_USLEEP \
	@@ -2119,23 +2123,29 @@
2119
2120	$(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
2121	$(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2122
2123	$(OBJDIR)/th.o: $(SRCDIR)/th.c


2124	$(XTCC) -c $(SRCDIR)/th.c -o $@
2125
2126	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c


2127	$(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2128
2129	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c


2130	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2131
2132
2133	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2134	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2135
2136	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2137	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2138
2139	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2140	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2141	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
2142

	--- src/main.mk
	+++ src/main.mk
	@@ -578,39 +578,41 @@
578	$(OBJDIR)/winfile.o \
579	$(OBJDIR)/winhttp.o \
580	$(OBJDIR)/xfer.o \
581	$(OBJDIR)/xfersetup.o \
582	$(OBJDIR)/zip.o
583	all: $(APPNAME)
584
585	install: all
586	mkdir -p $(INSTALLDIR)
587	cp $(APPNAME) $(INSTALLDIR)
588
589	codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
590	$(OBJDIR)/codecheck1 $(TRANS_SRC)
591



592	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
593	-mkdir -p $(OBJDIR)
594	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
595
596	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
597	-mkdir -p $(OBJDIR)
598	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
599
600	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
601	-mkdir -p $(OBJDIR)
602	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
603
604	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
605	-mkdir -p $(OBJDIR)
606	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
607
608	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
609	-mkdir -p $(OBJDIR)
610	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
611
612	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
613	-mkdir -p $(OBJDIR)
614	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
615
616	# Run the test suite.
617	# Other flags that can be included in TESTFLAGS are:
618	#
	@@ -622,11 +624,11 @@
624	# -strict Treat known bugs as failures
625	#
626	# TESTFLAGS can also include names of specific test files to limit
627	# the run to just those test cases.
628	#
629	test: $(APPNAME)
630	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
631
632	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
633	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
634	$(SRCDIR)/../manifest \
	@@ -653,10 +655,11 @@
655	-DSQLITE_ENABLE_DBSTAT_VTAB \
656	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
657	-DSQLITE_ENABLE_FTS4 \
658	-DSQLITE_ENABLE_FTS5 \
659	-DSQLITE_ENABLE_MATH_FUNCTIONS \
660	-DSQLITE_ENABLE_SETLK_TIMEOUT \
661	-DSQLITE_ENABLE_STMTVTAB \
662	-DSQLITE_HAVE_ZLIB \
663	-DSQLITE_ENABLE_DBPAGE_VTAB \
664	-DSQLITE_TRUSTED_SCHEMA=0 \
665	-DHAVE_USLEEP
	@@ -679,10 +682,11 @@
682	-DSQLITE_ENABLE_DBSTAT_VTAB \
683	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
684	-DSQLITE_ENABLE_FTS4 \
685	-DSQLITE_ENABLE_FTS5 \
686	-DSQLITE_ENABLE_MATH_FUNCTIONS \
687	-DSQLITE_ENABLE_SETLK_TIMEOUT \
688	-DSQLITE_ENABLE_STMTVTAB \
689	-DSQLITE_HAVE_ZLIB \
690	-DSQLITE_ENABLE_DBPAGE_VTAB \
691	-DSQLITE_TRUSTED_SCHEMA=0 \
692	-DHAVE_USLEEP \
	@@ -2119,23 +2123,29 @@
2123
2124	$(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
2125	$(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2126
2127	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2128	-mkdir -p $(OBJDIR)
2129
2130	$(XTCC) -c $(SRCDIR)/th.c -o $@
2131
2132	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2133	-mkdir -p $(OBJDIR)
2134
2135	$(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2136
2137	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2138	-mkdir -p $(OBJDIR)
2139
2140	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2141
2142
2143	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
2144	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2145
2146	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
2147	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2148
2149	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2150	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2151	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
2152

M src/manifest.c

+2 -2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -3024,11 +3024,11 @@
3024	3024	CARD_STR2(K, p->zTicketUuid);
3025	3025	CARD_STR2(L, p->zWikiTitle);
3026	3026	ISA( CFTYPE_CLUSTER ){
3027	3027	CARD_LETTER(M);
3028	3028	blob_append_char(b, '[');
3029		- for( int i = 0; i < p->nCChild; ++i ){
	3029	+ for( i = 0; i < p->nCChild; ++i ){
3030	3030	if( i>0 ) blob_append_char(b, ',');
3031	3031	blob_appendf(b, "%!j", p->azCChild[i]);
3032	3032	}
3033	3033	blob_append_char(b, ']');
3034	3034	}
		@@ -3059,11 +3059,11 @@
3059	3059	}
3060	3060	CARD_STR2(R, p->zRepoCksum);
3061	3061	if( p->nTag ){
3062	3062	CARD_LETTER(T);
3063	3063	blob_append_char(b, '[');
3064		- for( int i = 0; i < p->nTag; ++i ){
	3064	+ for( i = 0; i < p->nTag; ++i ){
3065	3065	const char *zName = p->aTag[i].zName;
3066	3066	if( i>0 ) blob_append_char(b, ',');
3067	3067	blob_append_char(b, '{');
3068	3068	blob_appendf(b, "\"type\":\"%c\"", *zName);
3069	3069	KVP_STR(1, name, &zName[1]);
3070	3070

	--- src/manifest.c
	+++ src/manifest.c
	@@ -3024,11 +3024,11 @@
3024	CARD_STR2(K, p->zTicketUuid);
3025	CARD_STR2(L, p->zWikiTitle);
3026	ISA( CFTYPE_CLUSTER ){
3027	CARD_LETTER(M);
3028	blob_append_char(b, '[');
3029	for( int i = 0; i < p->nCChild; ++i ){
3030	if( i>0 ) blob_append_char(b, ',');
3031	blob_appendf(b, "%!j", p->azCChild[i]);
3032	}
3033	blob_append_char(b, ']');
3034	}
	@@ -3059,11 +3059,11 @@
3059	}
3060	CARD_STR2(R, p->zRepoCksum);
3061	if( p->nTag ){
3062	CARD_LETTER(T);
3063	blob_append_char(b, '[');
3064	for( int i = 0; i < p->nTag; ++i ){
3065	const char *zName = p->aTag[i].zName;
3066	if( i>0 ) blob_append_char(b, ',');
3067	blob_append_char(b, '{');
3068	blob_appendf(b, "\"type\":\"%c\"", *zName);
3069	KVP_STR(1, name, &zName[1]);
3070

	--- src/manifest.c
	+++ src/manifest.c
	@@ -3024,11 +3024,11 @@
3024	CARD_STR2(K, p->zTicketUuid);
3025	CARD_STR2(L, p->zWikiTitle);
3026	ISA( CFTYPE_CLUSTER ){
3027	CARD_LETTER(M);
3028	blob_append_char(b, '[');
3029	for( i = 0; i < p->nCChild; ++i ){
3030	if( i>0 ) blob_append_char(b, ',');
3031	blob_appendf(b, "%!j", p->azCChild[i]);
3032	}
3033	blob_append_char(b, ']');
3034	}
	@@ -3059,11 +3059,11 @@
3059	}
3060	CARD_STR2(R, p->zRepoCksum);
3061	if( p->nTag ){
3062	CARD_LETTER(T);
3063	blob_append_char(b, '[');
3064	for( i = 0; i < p->nTag; ++i ){
3065	const char *zName = p->aTag[i].zName;
3066	if( i>0 ) blob_append_char(b, ',');
3067	blob_append_char(b, '{');
3068	blob_appendf(b, "\"type\":\"%c\"", *zName);
3069	KVP_STR(1, name, &zName[1]);
3070

M src/markdown_html.c

+1 -1

		--- src/markdown_html.c
		+++ src/markdown_html.c
		@@ -278,11 +278,11 @@
278	278	struct Blob *head_row,
279	279	struct Blob *rows,
280	280	void *opaque
281	281	){
282	282	INTER_BLOCK(ob);
283		- blob_append_literal(ob, "<table>\n");
	283	+ blob_append_literal(ob, "<table class='md-table'>\n");
284	284	if( head_row && blob_size(head_row)>0 ){
285	285	blob_append_literal(ob, "<thead>\n");
286	286	blob_appendb(ob, head_row);
287	287	blob_append_literal(ob, "</thead>\n<tbody>\n");
288	288	}
289	289

	--- src/markdown_html.c
	+++ src/markdown_html.c
	@@ -278,11 +278,11 @@
278	struct Blob *head_row,
279	struct Blob *rows,
280	void *opaque
281	){
282	INTER_BLOCK(ob);
283	blob_append_literal(ob, "<table>\n");
284	if( head_row && blob_size(head_row)>0 ){
285	blob_append_literal(ob, "<thead>\n");
286	blob_appendb(ob, head_row);
287	blob_append_literal(ob, "</thead>\n<tbody>\n");
288	}
289

	--- src/markdown_html.c
	+++ src/markdown_html.c
	@@ -278,11 +278,11 @@
278	struct Blob *head_row,
279	struct Blob *rows,
280	void *opaque
281	){
282	INTER_BLOCK(ob);
283	blob_append_literal(ob, "<table class='md-table'>\n");
284	if( head_row && blob_size(head_row)>0 ){
285	blob_append_literal(ob, "<thead>\n");
286	blob_appendb(ob, head_row);
287	blob_append_literal(ob, "</thead>\n<tbody>\n");
288	}
289

M src/name.c

+6 -3

		--- src/name.c
		+++ src/name.c
		@@ -1223,26 +1223,29 @@
1223	1223	db_finalize(&q);
1224	1224
1225	1225	/* Check to see if this object is used as a file in a check-in */
1226	1226	db_prepare(&q,
1227	1227	"SELECT filename.name, blob.uuid, datetime(event.mtime,toLocal()),"
1228		- " coalesce(euser,user), coalesce(ecomment,comment)"
	1228	+ " coalesce(euser,user), coalesce(ecomment,comment),"
	1229	+ " coalesce((SELECT value FROM tagxref"
	1230	+ " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
1229	1231	" FROM mlink, filename, blob, event"
1230	1232	" WHERE mlink.fid=%d"
1231	1233	" AND filename.fnid=mlink.fnid"
1232	1234	" AND event.objid=mlink.mid"
1233	1235	" AND blob.rid=mlink.mid"
1234	1236	" ORDER BY event.mtime %s /sort/",
1235		- rid,
	1237	+ TAG_BRANCH, rid,
1236	1238	(flags & WHATIS_BRIEF) ? "LIMIT 1" : "DESC");
1237	1239	while( db_step(&q)==SQLITE_ROW ){
1238	1240	if( flags & WHATIS_BRIEF ){
1239	1241	fossil_print("mtime: %s\n", db_column_text(&q,2));
1240	1242	}
1241	1243	fossil_print("file: %s\n", db_column_text(&q,0));
1242		- fossil_print(" part of [%S] by %s on %s\n",
	1244	+ fossil_print(" part of [%S] on branch %s by %s on %s\n",
1243	1245	db_column_text(&q, 1),
	1246	+ db_column_text(&q, 5),
1244	1247	db_column_text(&q, 3),
1245	1248	db_column_text(&q, 2));
1246	1249	fossil_print(" ");
1247	1250	comment_print(db_column_text(&q,4), 0, 12, -1, get_comment_format());
1248	1251	cnt++;
1249	1252

	--- src/name.c
	+++ src/name.c
	@@ -1223,26 +1223,29 @@
1223	db_finalize(&q);
1224
1225	/* Check to see if this object is used as a file in a check-in */
1226	db_prepare(&q,
1227	"SELECT filename.name, blob.uuid, datetime(event.mtime,toLocal()),"
1228	" coalesce(euser,user), coalesce(ecomment,comment)"


1229	" FROM mlink, filename, blob, event"
1230	" WHERE mlink.fid=%d"
1231	" AND filename.fnid=mlink.fnid"
1232	" AND event.objid=mlink.mid"
1233	" AND blob.rid=mlink.mid"
1234	" ORDER BY event.mtime %s /sort/",
1235	rid,
1236	(flags & WHATIS_BRIEF) ? "LIMIT 1" : "DESC");
1237	while( db_step(&q)==SQLITE_ROW ){
1238	if( flags & WHATIS_BRIEF ){
1239	fossil_print("mtime: %s\n", db_column_text(&q,2));
1240	}
1241	fossil_print("file: %s\n", db_column_text(&q,0));
1242	fossil_print(" part of [%S] by %s on %s\n",
1243	db_column_text(&q, 1),

1244	db_column_text(&q, 3),
1245	db_column_text(&q, 2));
1246	fossil_print(" ");
1247	comment_print(db_column_text(&q,4), 0, 12, -1, get_comment_format());
1248	cnt++;
1249

	--- src/name.c
	+++ src/name.c
	@@ -1223,26 +1223,29 @@
1223	db_finalize(&q);
1224
1225	/* Check to see if this object is used as a file in a check-in */
1226	db_prepare(&q,
1227	"SELECT filename.name, blob.uuid, datetime(event.mtime,toLocal()),"
1228	" coalesce(euser,user), coalesce(ecomment,comment),"
1229	" coalesce((SELECT value FROM tagxref"
1230	" WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
1231	" FROM mlink, filename, blob, event"
1232	" WHERE mlink.fid=%d"
1233	" AND filename.fnid=mlink.fnid"
1234	" AND event.objid=mlink.mid"
1235	" AND blob.rid=mlink.mid"
1236	" ORDER BY event.mtime %s /sort/",
1237	TAG_BRANCH, rid,
1238	(flags & WHATIS_BRIEF) ? "LIMIT 1" : "DESC");
1239	while( db_step(&q)==SQLITE_ROW ){
1240	if( flags & WHATIS_BRIEF ){
1241	fossil_print("mtime: %s\n", db_column_text(&q,2));
1242	}
1243	fossil_print("file: %s\n", db_column_text(&q,0));
1244	fossil_print(" part of [%S] on branch %s by %s on %s\n",
1245	db_column_text(&q, 1),
1246	db_column_text(&q, 5),
1247	db_column_text(&q, 3),
1248	db_column_text(&q, 2));
1249	fossil_print(" ");
1250	comment_print(db_column_text(&q,4), 0, 12, -1, get_comment_format());
1251	cnt++;
1252

M src/printf.c

+12 -4

		--- src/printf.c
		+++ src/printf.c
		@@ -774,10 +774,11 @@
774	774	char q = ((xtype==etSQLESCAPE3)?'"':'\''); /* Quote characters */
775	775	char escarg = va_arg(ap,char);
776	776	isnull = escarg==0;
777	777	if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
778	778	if( limit<0 ) limit = strlen(escarg);
	779	+ if( precision>=0 && precision<limit ) limit = precision;
779	780	for(i=n=0; i<limit; i++){
780	781	if( escarg[i]==q ) n++;
781	782	}
782	783	needQuote = !isnull && xtype==etSQLESCAPE2;
783	784	n += i + 1 + needQuote*2;
		@@ -793,11 +794,10 @@
793	794	if( ch==q ) bufpt[j++] = ch;
794	795	}
795	796	if( needQuote ) bufpt[j++] = q;
796	797	bufpt[j] = 0;
797	798	length = j;
798		- if( precision>=0 && precision<length ) length = precision;
799	799	break;
800	800	}
801	801	case etHTMLIZE: {
802	802	int limit = flag_alternateform ? va_arg(ap,int) : -1;
803	803	char zMem = va_arg(ap,char);
		@@ -1158,15 +1158,23 @@
1158	1158	#endif
1159	1159	if( g.cgiOutput==1 && g.db ){
1160	1160	g.cgiOutput = 2;
1161	1161	cgi_reset_content();
1162	1162	cgi_set_content_type("text/html");
1163		- style_set_current_feature("error");
	1163	+ if( g.zLogin!=0 ){
	1164	+ style_set_current_feature("error");
	1165	+ }
1164	1166	style_header("Bad Request");
1165	1167	etag_cancel();
1166		- @ <p class="generalError">%h(z)</p>
1167		- cgi_set_status(400, "Bad Request");
	1168	+ if( g.zLogin==0 ){
	1169	+ /* Do not give unnecessary clues about a malfunction to robots */
	1170	+ @ <p>Something did not work right.</p>
	1171	+ @ <p>%h(z)</p>
	1172	+ }else{
	1173	+ @ <p class="generalError">%h(z)</p>
	1174	+ cgi_set_status(400, "Bad Request");
	1175	+ }
1168	1176	style_finish_page();
1169	1177	cgi_reply();
1170	1178	}else if( !g.fQuiet ){
1171	1179	fossil_force_newline();
1172	1180	fossil_trace("%s\n", z);
1173	1181

	--- src/printf.c
	+++ src/printf.c
	@@ -774,10 +774,11 @@
774	char q = ((xtype==etSQLESCAPE3)?'"':'\''); /* Quote characters */
775	char escarg = va_arg(ap,char);
776	isnull = escarg==0;
777	if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
778	if( limit<0 ) limit = strlen(escarg);

779	for(i=n=0; i<limit; i++){
780	if( escarg[i]==q ) n++;
781	}
782	needQuote = !isnull && xtype==etSQLESCAPE2;
783	n += i + 1 + needQuote*2;
	@@ -793,11 +794,10 @@
793	if( ch==q ) bufpt[j++] = ch;
794	}
795	if( needQuote ) bufpt[j++] = q;
796	bufpt[j] = 0;
797	length = j;
798	if( precision>=0 && precision<length ) length = precision;
799	break;
800	}
801	case etHTMLIZE: {
802	int limit = flag_alternateform ? va_arg(ap,int) : -1;
803	char zMem = va_arg(ap,char);
	@@ -1158,15 +1158,23 @@
1158	#endif
1159	if( g.cgiOutput==1 && g.db ){
1160	g.cgiOutput = 2;
1161	cgi_reset_content();
1162	cgi_set_content_type("text/html");
1163	style_set_current_feature("error");


1164	style_header("Bad Request");
1165	etag_cancel();
1166	@ <p class="generalError">%h(z)</p>
1167	cgi_set_status(400, "Bad Request");






1168	style_finish_page();
1169	cgi_reply();
1170	}else if( !g.fQuiet ){
1171	fossil_force_newline();
1172	fossil_trace("%s\n", z);
1173

	--- src/printf.c
	+++ src/printf.c
	@@ -774,10 +774,11 @@
774	char q = ((xtype==etSQLESCAPE3)?'"':'\''); /* Quote characters */
775	char escarg = va_arg(ap,char);
776	isnull = escarg==0;
777	if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
778	if( limit<0 ) limit = strlen(escarg);
779	if( precision>=0 && precision<limit ) limit = precision;
780	for(i=n=0; i<limit; i++){
781	if( escarg[i]==q ) n++;
782	}
783	needQuote = !isnull && xtype==etSQLESCAPE2;
784	n += i + 1 + needQuote*2;
	@@ -793,11 +794,10 @@
794	if( ch==q ) bufpt[j++] = ch;
795	}
796	if( needQuote ) bufpt[j++] = q;
797	bufpt[j] = 0;
798	length = j;

799	break;
800	}
801	case etHTMLIZE: {
802	int limit = flag_alternateform ? va_arg(ap,int) : -1;
803	char zMem = va_arg(ap,char);
	@@ -1158,15 +1158,23 @@
1158	#endif
1159	if( g.cgiOutput==1 && g.db ){
1160	g.cgiOutput = 2;
1161	cgi_reset_content();
1162	cgi_set_content_type("text/html");
1163	if( g.zLogin!=0 ){
1164	style_set_current_feature("error");
1165	}
1166	style_header("Bad Request");
1167	etag_cancel();
1168	if( g.zLogin==0 ){
1169	/* Do not give unnecessary clues about a malfunction to robots */
1170	@ <p>Something did not work right.</p>
1171	@ <p>%h(z)</p>
1172	}else{
1173	@ <p class="generalError">%h(z)</p>
1174	cgi_set_status(400, "Bad Request");
1175	}
1176	style_finish_page();
1177	cgi_reply();
1178	}else if( !g.fQuiet ){
1179	fossil_force_newline();
1180	fossil_trace("%s\n", z);
1181

M src/repolist.c

+4 -1

		--- src/repolist.c
		+++ src/repolist.c
		@@ -157,17 +157,20 @@
157	157	allRepo = 1;
158	158	}else{
159	159	/* The default case: All repositories under the g.zRepositoryName
160	160	** directory.
161	161	*/
	162	+ Glob *pExclude;
162	163	blob_init(&base, g.zRepositoryName, -1);
163	164	db_close(0);
164	165	assert( g.db==0 );
165	166	sqlite3_open(":memory:", &g.db);
166	167	db_multi_exec("CREATE TABLE sfile(pathname TEXT);");
167	168	db_multi_exec("CREATE TABLE vfile(pathname);");
168		- vfile_scan(&base, blob_size(&base), 0, 0, 0, ExtFILE);
	169	+ pExclude = glob_create("*/proc,proc");
	170	+ vfile_scan(&base, blob_size(&base), 0, pExclude, 0, ExtFILE);
	171	+ glob_free(pExclude);
169	172	db_multi_exec("DELETE FROM sfile WHERE pathname NOT GLOB '*[^/].fossil'"
170	173	#if USE_SEE
171	174	" AND pathname NOT GLOB '*[^/].efossil'"
172	175	#endif
173	176	);
174	177

	--- src/repolist.c
	+++ src/repolist.c
	@@ -157,17 +157,20 @@
157	allRepo = 1;
158	}else{
159	/* The default case: All repositories under the g.zRepositoryName
160	** directory.
161	*/

162	blob_init(&base, g.zRepositoryName, -1);
163	db_close(0);
164	assert( g.db==0 );
165	sqlite3_open(":memory:", &g.db);
166	db_multi_exec("CREATE TABLE sfile(pathname TEXT);");
167	db_multi_exec("CREATE TABLE vfile(pathname);");
168	vfile_scan(&base, blob_size(&base), 0, 0, 0, ExtFILE);


169	db_multi_exec("DELETE FROM sfile WHERE pathname NOT GLOB '*[^/].fossil'"
170	#if USE_SEE
171	" AND pathname NOT GLOB '*[^/].efossil'"
172	#endif
173	);
174

	--- src/repolist.c
	+++ src/repolist.c
	@@ -157,17 +157,20 @@
157	allRepo = 1;
158	}else{
159	/* The default case: All repositories under the g.zRepositoryName
160	** directory.
161	*/
162	Glob *pExclude;
163	blob_init(&base, g.zRepositoryName, -1);
164	db_close(0);
165	assert( g.db==0 );
166	sqlite3_open(":memory:", &g.db);
167	db_multi_exec("CREATE TABLE sfile(pathname TEXT);");
168	db_multi_exec("CREATE TABLE vfile(pathname);");
169	pExclude = glob_create("*/proc,proc");
170	vfile_scan(&base, blob_size(&base), 0, pExclude, 0, ExtFILE);
171	glob_free(pExclude);
172	db_multi_exec("DELETE FROM sfile WHERE pathname NOT GLOB '*[^/].fossil'"
173	#if USE_SEE
174	" AND pathname NOT GLOB '*[^/].efossil'"
175	#endif
176	);
177

M src/security_audit.c

+15 -2

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -830,10 +830,11 @@
830	830	** y=0x004 Show hung backoffice processes
831	831	** y=0x008 Show POST requests from a different origin
832	832	** y=0x010 Show SQLITE_AUTH and similar
833	833	** y=0x020 Show SMTP error reports
834	834	** y=0x040 Show TH1 vulnerability reports
	835	+** y=0x080 Show SQL errors
835	836	** y=0x800 Show other uncategorized messages
836	837	**
837	838	** If y is omitted or is zero, a count of the various message types is
838	839	** shown.
839	840	*/
		@@ -840,11 +841,11 @@
840	841	void errorlog_page(void){
841	842	i64 szFile;
842	843	FILE *in;
843	844	char *zLog;
844	845	const char *zType = P("y");
845		- static const int eAllTypes = 0x87f;
	846	+ static const int eAllTypes = 0x8ff;
846	847	long eType = 0;
847	848	int bOutput = 0;
848	849	int prevWasTime = 0;
849	850	int nHack = 0;
850	851	int nPanic = 0;
		@@ -852,10 +853,11 @@
852	853	int nHang = 0;
853	854	int nXPost = 0;
854	855	int nAuth = 0;
855	856	int nSmtp = 0;
856	857	int nVuln = 0;
	858	+ int nSqlErr = 0;
857	859	char z[10000];
858	860	char zTime[10000];
859	861
860	862	login_check_credentials();
861	863	if( !g.perm.Admin ){
		@@ -933,10 +935,13 @@
933	935	if( eType & 0x20 ){
934	936	@ <li>SMTP malfunctions
935	937	}
936	938	if( eType & 0x40 ){
937	939	@ <li>TH1 vulnerabilities
	940	+ }
	941	+ if( eType & 0x80 ){
	942	+ @ <li>SQL errors
938	943	}
939	944	if( eType & 0x800 ){
940	945	@ <li>Other uncategorized messages
941	946	}
942	947	@ </ul>
		@@ -975,10 +980,14 @@
975	980	}else
976	981	if( strncmp(z,"possible", 8)==0 && strstr(z,"tainted")!=0 ){
977	982	bOutput = (eType & 0x40)!=0;
978	983	nVuln++;
979	984	}else
	985	+ if( strstr(z,"statement aborts at ") ){
	986	+ bOutput = (eType & 0x80)!=0;
	987	+ nSqlErr++;
	988	+ }else
980	989	{
981	990	bOutput = (eType & 0x800)!=0;
982	991	nOther++;
983	992	}
984	993	if( bOutput ){
		@@ -1000,11 +1009,11 @@
1000	1009	fclose(in);
1001	1010	if( eType ){
1002	1011	@ </pre>
1003	1012	}
1004	1013	if( eType==0 ){
1005		- int nNonHack = nPanic + nHang + nAuth + nSmtp + nVuln + nOther;
	1014	+ int nNonHack = nPanic + nHang + nAuth + nSmtp + nVuln + nOther + nSqlErr;
1006	1015	int nTotal = nNonHack + nHack + nXPost;
1007	1016	@ <p><table border="a" cellspacing="0" cellpadding="5">
1008	1017	if( nPanic>0 ){
1009	1018	@ <tr><td align="right">%d(nPanic)</td>
1010	1019	@ <td><a href="./errorlog?y=2">Panics</a></td>
		@@ -1015,10 +1024,14 @@
1015	1024	}
1016	1025	if( nHack>0 ){
1017	1026	@ <tr><td align="right">%d(nHack)</td>
1018	1027	@ <td><a href="./errorlog?y=1">Hack Attempts</a></td>
1019	1028	}
	1029	+ if( nSqlErr>0 ){
	1030	+ @ <tr><td align="right">%d(nSqlErr)</td>
	1031	+ @ <td><a href="./errorlog?y=128">SQL Errors</a></td>
	1032	+ }
1020	1033	if( nHang>0 ){
1021	1034	@ <tr><td align="right">%d(nHang)</td>
1022	1035	@ <td><a href="./errorlog?y=4">Hung Backoffice</a></td>
1023	1036	}
1024	1037	if( nXPost>0 ){
1025	1038

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -830,10 +830,11 @@
830	** y=0x004 Show hung backoffice processes
831	** y=0x008 Show POST requests from a different origin
832	** y=0x010 Show SQLITE_AUTH and similar
833	** y=0x020 Show SMTP error reports
834	** y=0x040 Show TH1 vulnerability reports

835	** y=0x800 Show other uncategorized messages
836	**
837	** If y is omitted or is zero, a count of the various message types is
838	** shown.
839	*/
	@@ -840,11 +841,11 @@
840	void errorlog_page(void){
841	i64 szFile;
842	FILE *in;
843	char *zLog;
844	const char *zType = P("y");
845	static const int eAllTypes = 0x87f;
846	long eType = 0;
847	int bOutput = 0;
848	int prevWasTime = 0;
849	int nHack = 0;
850	int nPanic = 0;
	@@ -852,10 +853,11 @@
852	int nHang = 0;
853	int nXPost = 0;
854	int nAuth = 0;
855	int nSmtp = 0;
856	int nVuln = 0;

857	char z[10000];
858	char zTime[10000];
859
860	login_check_credentials();
861	if( !g.perm.Admin ){
	@@ -933,10 +935,13 @@
933	if( eType & 0x20 ){
934	@ <li>SMTP malfunctions
935	}
936	if( eType & 0x40 ){
937	@ <li>TH1 vulnerabilities



938	}
939	if( eType & 0x800 ){
940	@ <li>Other uncategorized messages
941	}
942	@ </ul>
	@@ -975,10 +980,14 @@
975	}else
976	if( strncmp(z,"possible", 8)==0 && strstr(z,"tainted")!=0 ){
977	bOutput = (eType & 0x40)!=0;
978	nVuln++;
979	}else




980	{
981	bOutput = (eType & 0x800)!=0;
982	nOther++;
983	}
984	if( bOutput ){
	@@ -1000,11 +1009,11 @@
1000	fclose(in);
1001	if( eType ){
1002	@ </pre>
1003	}
1004	if( eType==0 ){
1005	int nNonHack = nPanic + nHang + nAuth + nSmtp + nVuln + nOther;
1006	int nTotal = nNonHack + nHack + nXPost;
1007	@ <p><table border="a" cellspacing="0" cellpadding="5">
1008	if( nPanic>0 ){
1009	@ <tr><td align="right">%d(nPanic)</td>
1010	@ <td><a href="./errorlog?y=2">Panics</a></td>
	@@ -1015,10 +1024,14 @@
1015	}
1016	if( nHack>0 ){
1017	@ <tr><td align="right">%d(nHack)</td>
1018	@ <td><a href="./errorlog?y=1">Hack Attempts</a></td>
1019	}




1020	if( nHang>0 ){
1021	@ <tr><td align="right">%d(nHang)</td>
1022	@ <td><a href="./errorlog?y=4">Hung Backoffice</a></td>
1023	}
1024	if( nXPost>0 ){
1025

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -830,10 +830,11 @@
830	** y=0x004 Show hung backoffice processes
831	** y=0x008 Show POST requests from a different origin
832	** y=0x010 Show SQLITE_AUTH and similar
833	** y=0x020 Show SMTP error reports
834	** y=0x040 Show TH1 vulnerability reports
835	** y=0x080 Show SQL errors
836	** y=0x800 Show other uncategorized messages
837	**
838	** If y is omitted or is zero, a count of the various message types is
839	** shown.
840	*/
	@@ -840,11 +841,11 @@
841	void errorlog_page(void){
842	i64 szFile;
843	FILE *in;
844	char *zLog;
845	const char *zType = P("y");
846	static const int eAllTypes = 0x8ff;
847	long eType = 0;
848	int bOutput = 0;
849	int prevWasTime = 0;
850	int nHack = 0;
851	int nPanic = 0;
	@@ -852,10 +853,11 @@
853	int nHang = 0;
854	int nXPost = 0;
855	int nAuth = 0;
856	int nSmtp = 0;
857	int nVuln = 0;
858	int nSqlErr = 0;
859	char z[10000];
860	char zTime[10000];
861
862	login_check_credentials();
863	if( !g.perm.Admin ){
	@@ -933,10 +935,13 @@
935	if( eType & 0x20 ){
936	@ <li>SMTP malfunctions
937	}
938	if( eType & 0x40 ){
939	@ <li>TH1 vulnerabilities
940	}
941	if( eType & 0x80 ){
942	@ <li>SQL errors
943	}
944	if( eType & 0x800 ){
945	@ <li>Other uncategorized messages
946	}
947	@ </ul>
	@@ -975,10 +980,14 @@
980	}else
981	if( strncmp(z,"possible", 8)==0 && strstr(z,"tainted")!=0 ){
982	bOutput = (eType & 0x40)!=0;
983	nVuln++;
984	}else
985	if( strstr(z,"statement aborts at ") ){
986	bOutput = (eType & 0x80)!=0;
987	nSqlErr++;
988	}else
989	{
990	bOutput = (eType & 0x800)!=0;
991	nOther++;
992	}
993	if( bOutput ){
	@@ -1000,11 +1009,11 @@
1009	fclose(in);
1010	if( eType ){
1011	@ </pre>
1012	}
1013	if( eType==0 ){
1014	int nNonHack = nPanic + nHang + nAuth + nSmtp + nVuln + nOther + nSqlErr;
1015	int nTotal = nNonHack + nHack + nXPost;
1016	@ <p><table border="a" cellspacing="0" cellpadding="5">
1017	if( nPanic>0 ){
1018	@ <tr><td align="right">%d(nPanic)</td>
1019	@ <td><a href="./errorlog?y=2">Panics</a></td>
	@@ -1015,10 +1024,14 @@
1024	}
1025	if( nHack>0 ){
1026	@ <tr><td align="right">%d(nHack)</td>
1027	@ <td><a href="./errorlog?y=1">Hack Attempts</a></td>
1028	}
1029	if( nSqlErr>0 ){
1030	@ <tr><td align="right">%d(nSqlErr)</td>
1031	@ <td><a href="./errorlog?y=128">SQL Errors</a></td>
1032	}
1033	if( nHang>0 ){
1034	@ <tr><td align="right">%d(nHang)</td>
1035	@ <td><a href="./errorlog?y=4">Hung Backoffice</a></td>
1036	}
1037	if( nXPost>0 ){
1038

M src/setupuser.c

+1 -1

		--- src/setupuser.c
		+++ src/setupuser.c
		@@ -408,11 +408,11 @@
408	408	blob_appendf(&body, "Permissions for user [%q] where changed "
409	409	"from [%q] to [%q] by user [%q].\n",
410	410	zLogin, zOrigCaps, zNewCaps, g.zLogin);
411	411	}
412	412	if( zURL ){
413		- blob_appendf(&body, "\nUser editor: %s/setup_uedit?uid=%d\n", zURL, uid);
	413	+ blob_appendf(&body, "\nUser editor: %s/setup_uedit?id=%d\n", zURL, uid);
414	414	}
415	415	nBody = blob_size(&body);
416	416	pSender = alert_sender_new(0, 0);
417	417	db_prepare(&q,
418	418	"SELECT semail, hex(subscriberCode)"
419	419

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -408,11 +408,11 @@
408	blob_appendf(&body, "Permissions for user [%q] where changed "
409	"from [%q] to [%q] by user [%q].\n",
410	zLogin, zOrigCaps, zNewCaps, g.zLogin);
411	}
412	if( zURL ){
413	blob_appendf(&body, "\nUser editor: %s/setup_uedit?uid=%d\n", zURL, uid);
414	}
415	nBody = blob_size(&body);
416	pSender = alert_sender_new(0, 0);
417	db_prepare(&q,
418	"SELECT semail, hex(subscriberCode)"
419

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -408,11 +408,11 @@
408	blob_appendf(&body, "Permissions for user [%q] where changed "
409	"from [%q] to [%q] by user [%q].\n",
410	zLogin, zOrigCaps, zNewCaps, g.zLogin);
411	}
412	if( zURL ){
413	blob_appendf(&body, "\nUser editor: %s/setup_uedit?id=%d\n", zURL, uid);
414	}
415	nBody = blob_size(&body);
416	pSender = alert_sender_new(0, 0);
417	db_prepare(&q,
418	"SELECT semail, hex(subscriberCode)"
419

M src/stat.c

+5 -3

		--- src/stat.c
		+++ src/stat.c
		@@ -268,16 +268,18 @@
268	268	}
269	269	@ <tr><th>Project Age:</th><td>
270	270	z = db_text(0, "SELECT timediff('now',(SELECT min(mtime) FROM event));");
271	271	sscanf(z, "+%d-%d-%d", &Y, &M, &D);
272	272	if( Y>0 ){
273		- @ %d(Y) years, \
	273	+ @ %d(Y) year%s(Y==1?"":"s") \
274	274	}
275	275	if( M>0 ){
276		- @ %d(M) months, \
	276	+ @ %d(M) month%s(M==1?"":"s") \
277	277	}
278		- @ %d(D) days
	278	+ if( D>0 \|\| (Y==0 && M==0) ){
	279	+ @ %d(D) day%s(D==1?"":"s")
	280	+ }
279	281	@ </td></tr>
280	282	p = db_get("project-code", 0);
281	283	if( p ){
282	284	@ <tr><th>Project ID:</th>
283	285	@ <td>%h(p) %h(db_get("project-name",""))</td></tr>
284	286

	--- src/stat.c
	+++ src/stat.c
	@@ -268,16 +268,18 @@
268	}
269	@ <tr><th>Project Age:</th><td>
270	z = db_text(0, "SELECT timediff('now',(SELECT min(mtime) FROM event));");
271	sscanf(z, "+%d-%d-%d", &Y, &M, &D);
272	if( Y>0 ){
273	@ %d(Y) years, \
274	}
275	if( M>0 ){
276	@ %d(M) months, \
277	}
278	@ %d(D) days


279	@ </td></tr>
280	p = db_get("project-code", 0);
281	if( p ){
282	@ <tr><th>Project ID:</th>
283	@ <td>%h(p) %h(db_get("project-name",""))</td></tr>
284

	--- src/stat.c
	+++ src/stat.c
	@@ -268,16 +268,18 @@
268	}
269	@ <tr><th>Project Age:</th><td>
270	z = db_text(0, "SELECT timediff('now',(SELECT min(mtime) FROM event));");
271	sscanf(z, "+%d-%d-%d", &Y, &M, &D);
272	if( Y>0 ){
273	@ %d(Y) year%s(Y==1?"":"s") \
274	}
275	if( M>0 ){
276	@ %d(M) month%s(M==1?"":"s") \
277	}
278	if( D>0 \|\| (Y==0 && M==0) ){
279	@ %d(D) day%s(D==1?"":"s")
280	}
281	@ </td></tr>
282	p = db_get("project-code", 0);
283	if( p ){
284	@ <tr><th>Project ID:</th>
285	@ <td>%h(p) %h(db_get("project-name",""))</td></tr>
286

M src/tag.c

+1 -1

		--- src/tag.c
		+++ src/tag.c
		@@ -412,11 +412,11 @@
412	412	** non-CHECK-IN artifacts.
413	413	** --user-override USER Name USER when adding the tag
414	414	**
415	415	** The --date-override and --user-override options support
416	416	** importing history from other SCM systems. DATETIME has
417		-** the form 'YYYY-MMM-DD HH:MM:SS'.
	417	+** the form 'YYYY-MM-DD HH:MM:SS'.
418	418	**
419	419	** Note that fossil uses some tag prefixes internally and this
420	420	** command will reject tags with these prefixes to avoid
421	421	** causing problems or confusion: "wiki-", "tkt-", "event-".
422	422	**
423	423

	--- src/tag.c
	+++ src/tag.c
	@@ -412,11 +412,11 @@
412	** non-CHECK-IN artifacts.
413	** --user-override USER Name USER when adding the tag
414	**
415	** The --date-override and --user-override options support
416	** importing history from other SCM systems. DATETIME has
417	** the form 'YYYY-MMM-DD HH:MM:SS'.
418	**
419	** Note that fossil uses some tag prefixes internally and this
420	** command will reject tags with these prefixes to avoid
421	** causing problems or confusion: "wiki-", "tkt-", "event-".
422	**
423

	--- src/tag.c
	+++ src/tag.c
	@@ -412,11 +412,11 @@
412	** non-CHECK-IN artifacts.
413	** --user-override USER Name USER when adding the tag
414	**
415	** The --date-override and --user-override options support
416	** importing history from other SCM systems. DATETIME has
417	** the form 'YYYY-MM-DD HH:MM:SS'.
418	**
419	** Note that fossil uses some tag prefixes internally and this
420	** command will reject tags with these prefixes to avoid
421	** causing problems or confusion: "wiki-", "tkt-", "event-".
422	**
423

M src/th_tcl.c

		--- src/th_tcl.c
		+++ src/th_tcl.c
		@@ -24,10 +24,14 @@
24	24
25	25	#include "sqlite3.h"
26	26	#include "th.h"
27	27	#include "tcl.h"
28	28
	29	+#if TCL_MAJOR_VERSION<9 && !defined(Tcl_Size)
	30	+# define Tcl_Size int
	31	+#endif
	32	+
29	33	/*
30	34	** This macro is used to verify that the header version of Tcl meets some
31	35	** minimum requirement.
32	36	*/
33	37	#define MINIMUM_TCL_VERSION(major, minor) \
		@@ -183,11 +187,15 @@
183	187	** the only Tcl API functions that MUST be called prior to being able to call
184	188	** Tcl_InitStubs (i.e. because it requires a Tcl interpreter). For complete
185	189	** cleanup if the Tcl stubs initialization fails somehow, the Tcl_DeleteInterp
186	190	** and Tcl_Finalize function types are also required.
187	191	*/
	192	+#if TCL_MAJOR_VERSION>=9
188	193	typedef const char (tcl_FindExecutableProc) (const char );
	194	+#else
	195	+typedef void (tcl_FindExecutableProc) (const char *);
	196	+#endif
189	197	typedef Tcl_Interp *(tcl_CreateInterpProc) (void);
190	198	typedef void (tcl_DeleteInterpProc) (Tcl_Interp *);
191	199	typedef void (tcl_FinalizeProc) (void);
192	200
193	201	/*
194	202

	--- src/th_tcl.c
	+++ src/th_tcl.c
	@@ -24,10 +24,14 @@
24
25	#include "sqlite3.h"
26	#include "th.h"
27	#include "tcl.h"
28




29	/*
30	** This macro is used to verify that the header version of Tcl meets some
31	** minimum requirement.
32	*/
33	#define MINIMUM_TCL_VERSION(major, minor) \
	@@ -183,11 +187,15 @@
183	** the only Tcl API functions that MUST be called prior to being able to call
184	** Tcl_InitStubs (i.e. because it requires a Tcl interpreter). For complete
185	** cleanup if the Tcl stubs initialization fails somehow, the Tcl_DeleteInterp
186	** and Tcl_Finalize function types are also required.
187	*/

188	typedef const char (tcl_FindExecutableProc) (const char );



189	typedef Tcl_Interp *(tcl_CreateInterpProc) (void);
190	typedef void (tcl_DeleteInterpProc) (Tcl_Interp *);
191	typedef void (tcl_FinalizeProc) (void);
192
193	/*
194

	--- src/th_tcl.c
	+++ src/th_tcl.c
	@@ -24,10 +24,14 @@
24
25	#include "sqlite3.h"
26	#include "th.h"
27	#include "tcl.h"
28
29	#if TCL_MAJOR_VERSION<9 && !defined(Tcl_Size)
30	# define Tcl_Size int
31	#endif
32
33	/*
34	** This macro is used to verify that the header version of Tcl meets some
35	** minimum requirement.
36	*/
37	#define MINIMUM_TCL_VERSION(major, minor) \
	@@ -183,11 +187,15 @@
187	** the only Tcl API functions that MUST be called prior to being able to call
188	** Tcl_InitStubs (i.e. because it requires a Tcl interpreter). For complete
189	** cleanup if the Tcl stubs initialization fails somehow, the Tcl_DeleteInterp
190	** and Tcl_Finalize function types are also required.
191	*/
192	#if TCL_MAJOR_VERSION>=9
193	typedef const char (tcl_FindExecutableProc) (const char );
194	#else
195	typedef void (tcl_FindExecutableProc) (const char *);
196	#endif
197	typedef Tcl_Interp *(tcl_CreateInterpProc) (void);
198	typedef void (tcl_DeleteInterpProc) (Tcl_Interp *);
199	typedef void (tcl_FinalizeProc) (void);
200
201	/*
202

M src/timeline.c

+53 -11

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1273,11 +1273,11 @@
1273	1273	*/
1274	1274	static void addFileGlobExclusion(
1275	1275	const char zChng, / The filename GLOB list */
1276	1276	Blob pSql / The SELECT statement under construction */
1277	1277	){
1278		- if( zChng==0 \|\| zChng[0]==0 ) return;
	1278	+ if( zChng==0 ) return;
1279	1279	blob_append_sql(pSql," AND event.objid IN ("
1280	1280	"SELECT mlink.mid FROM mlink, filename\n"
1281	1281	" WHERE mlink.fnid=filename.fnid\n"
1282	1282	" AND %s)",
1283	1283	glob_expr("filename.name", mprintf("\"%s\"", zChng)));
		@@ -1284,14 +1284,33 @@
1284	1284	}
1285	1285	static void addFileGlobDescription(
1286	1286	const char zChng, / The filename GLOB list */
1287	1287	Blob pDescription / Result description */
1288	1288	){
1289		- if( zChng==0 \|\| zChng[0]==0 ) return;
	1289	+ if( zChng==0 ) return;
1290	1290	blob_appendf(pDescription, " that include changes to files matching '%h'",
1291	1291	zChng);
1292	1292	}
	1293	+
	1294	+/*
	1295	+** If zChng is not NULL, then use it as a comma-separated list of
	1296	+** glob patterns for filenames, and remove from the "ok" table any
	1297	+** check-ins that do not modify one or more of the files identified
	1298	+** by zChng.
	1299	+*/
	1300	+static void removeFileGlobFromOk(
	1301	+ const char zChng / The filename GLOB list */
	1302	+){
	1303	+ if( zChng==0 ) return;
	1304	+ db_multi_exec(
	1305	+ "DELETE FROM ok WHERE rid NOT IN (\n"
	1306	+ " SELECT mlink.mid FROM mlink, filename\n"
	1307	+ " WHERE mlink.fnid=filename.fnid\n"
	1308	+ " AND %z);\n",
	1309	+ glob_expr("filename.name", zChng)
	1310	+ );
	1311	+}
1293	1312
1294	1313	/*
1295	1314	** Similar to fossil_expand_datetime()
1296	1315	**
1297	1316	** Add missing "-" characters into a date/time. Examples:
		@@ -1777,10 +1796,11 @@
1777	1796	nEntry = 0;
1778	1797	useDividers = 0;
1779	1798	cgi_replace_query_parameter("d",fossil_strdup(z));
1780	1799	zDPNameD = zDPNameP = z;
1781	1800	}
	1801	+ if( zChng && zChng[0]==0 ) zChng = 0;
1782	1802
1783	1803	/* Undocumented query parameter to set JS mode */
1784	1804	builtin_set_js_delivery_mode(P("jsmode"),1);
1785	1805
1786	1806	secondaryRid = name_to_typed_rid(P("sel2"),"ci");
		@@ -2174,12 +2194,14 @@
2174	2194	);
2175	2195	}
2176	2196	db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related");
2177	2197	}
2178	2198	add_extra_rids("pathnode",P("x"));
	2199	+ add_extra_rids("pathnode",P("sel1"));
	2200	+ add_extra_rids("pathnode",P("sel2"));
2179	2201	blob_append_sql(&sql, " AND event.objid IN pathnode");
2180		- if( zChng && zChng[0] ){
	2202	+ if( zChng ){
2181	2203	db_multi_exec(
2182	2204	"DELETE FROM pathnode\n"
2183	2205	" WHERE NOT EXISTS(SELECT 1 FROM mlink, filename\n"
2184	2206	" WHERE mlink.mid=x\n"
2185	2207	" AND mlink.fnid=filename.fnid\n"
		@@ -2248,10 +2270,12 @@
2248	2270	}
2249	2271	db_multi_exec(
2250	2272	"CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)"
2251	2273	);
2252	2274	add_extra_rids("ok", P("x"));
	2275	+ add_extra_rids("ok", P("sel1"));
	2276	+ add_extra_rids("ok", P("sel2"));
2253	2277	blob_append_sql(&sql, " AND event.objid IN ok");
2254	2278	nd = 0;
2255	2279	if( d_rid ){
2256	2280	double rStopTime = 9e99;
2257	2281	zFwdTo = P("ft");
		@@ -2299,14 +2323,16 @@
2299	2323	db_multi_exec(
2300	2324	"INSERT INTO ok_d SELECT rid FROM ok;"
2301	2325	"DELETE FROM ok;"
2302	2326	);
2303	2327	}else{
	2328	+ removeFileGlobFromOk(zChng);
2304	2329	nd = db_int(0, "SELECT count(*)-1 FROM ok");
2305	2330	if( nd>=0 ) db_multi_exec("%s", blob_sql_text(&sql));
2306	2331	if( nd>0 \|\| p_rid==0 ){
2307		- blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s");
	2332	+ blob_appendf(&desc, "%d descendant%s",
	2333	+ nd>=0 ? nd : 0,(1==nd)?"":"s");
2308	2334	}
2309	2335	if( useDividers && !selectedRid ) selectedRid = d_rid;
2310	2336	db_multi_exec("DELETE FROM ok");
2311	2337	}
2312	2338	}
		@@ -2335,30 +2361,34 @@
2335	2361	db_multi_exec("INSERT OR IGNORE INTO ok VALUES(%d)", ridBackTo);
2336	2362	bBackAdded = 1;
2337	2363	}
2338	2364	if( bSeparateDandP ){
2339	2365	db_multi_exec("DELETE FROM ok WHERE rid NOT IN ok_d;");
	2366	+ removeFileGlobFromOk(zChng);
2340	2367	db_multi_exec("%s", blob_sql_text(&sql));
2341	2368	}else{
	2369	+ removeFileGlobFromOk(zChng);
2342	2370	np = db_int(0, "SELECT count(*)-1 FROM ok");
2343	2371	if( np>0 \|\| nd==0 ){
2344	2372	if( nd>0 ) blob_appendf(&desc, " and ");
2345		- blob_appendf(&desc, "%d ancestor%s", np, (1==np)?"":"s");
	2373	+ blob_appendf(&desc, "%d ancestor%s",
	2374	+ np>=0 ? np : 0, (1==np)?"":"s");
2346	2375	db_multi_exec("%s", blob_sql_text(&sql));
2347	2376	}
2348	2377	if( useDividers && !selectedRid ) selectedRid = p_rid;
2349	2378	}
2350	2379	}
	2380	+
2351	2381	if( bSeparateDandP ){
2352	2382	int n = db_int(0, "SELECT count(*) FROM ok");
2353	2383	blob_reset(&desc);
2354	2384	blob_appendf(&desc,
2355		- "%d check-ins that are both ancestors of %z%h</a>"
2356		- " and descendants of %z%h</a>",
	2385	+ "%d check-ins that are derived from %z%h</a>"
	2386	+ " and contribute to %z%h</a>",
2357	2387	n,
2358		- href("%R/info?name=%h",zDPNameP),zDPNameP,
2359		- href("%R/info?name=%h",zDPNameD),zDPNameD
	2388	+ href("%R/info?name=%h",zDPNameD),zDPNameD,
	2389	+ href("%R/info?name=%h",zDPNameP),zDPNameP
2360	2390	);
2361	2391	ridBackTo = 0;
2362	2392	ridFwdTo = 0;
2363	2393	}else{
2364	2394	blob_appendf(&desc, " of %z%h</a>",
		@@ -2392,10 +2422,14 @@
2392	2422	blob_appendf(&desc, " up to %z%h</a>%s",
2393	2423	href("%R/info?name=%h",zFwdTo), zFwdTo,
2394	2424	bFwdAdded ? " (not a direct descendant)":"");
2395	2425	}
2396	2426	}
	2427	+ if( zChng ){
	2428	+ if( strstr(blob_str(&desc)," that ") ) blob_appendf(&desc, " and");
	2429	+ blob_appendf(&desc, " that make changes to files matching \"%h\"", zChng);
	2430	+ }
2397	2431	if( advancedMenu ){
2398	2432	style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0);
2399	2433	}
2400	2434	style_submenu_entry("n","Max:",4,0);
2401	2435	timeline_y_submenu(1);
		@@ -2730,10 +2764,12 @@
2730	2764	int ridMark = name_to_rid(zMark);
2731	2765	db_multi_exec(
2732	2766	"INSERT OR IGNORE INTO selected_nodes(rid) VALUES(%d)", ridMark);
2733	2767	}
2734	2768	add_extra_rids("selected_nodes",P("x"));
	2769	+ add_extra_rids("selected_nodes",P("sel1"));
	2770	+ add_extra_rids("selected_nodes",P("sel2"));
2735	2771	if( related==0 ){
2736	2772	blob_append_sql(&cond, " AND blob.rid IN selected_nodes");
2737	2773	}else{
2738	2774	db_multi_exec(
2739	2775	"CREATE TEMP TABLE related_nodes(rid INTEGER PRIMARY KEY);"
		@@ -3816,13 +3852,19 @@
3816	3852	" AND (tagxref.value IS NULL OR tagxref.value='%q')",
3817	3853	zBr, zBr, zBr, TAG_BRANCH, zBr, zBr);
3818	3854	}
3819	3855
3820	3856	if( mode==TIMELINE_MODE_AFTER ){
	3857	+ int lim = n;
	3858	+ if( n == 0 ){
	3859	+ lim = -1; /* 0 means no limit */
	3860	+ }else if( n < 0 ){
	3861	+ lim = -n;
	3862	+ }
3821	3863	/* Complete the above outer select. */
3822	3864	blob_append_sql(&sql,
3823		- "\nORDER BY event.mtime LIMIT abs(%d)) t ORDER BY t.mDateTime DESC;", n);
	3865	+ "\nORDER BY event.mtime LIMIT %d) t ORDER BY t.mDateTime DESC;", lim);
3824	3866	}else{
3825	3867	blob_append_sql(&sql, "\nORDER BY event.mtime DESC");
3826	3868	}
3827	3869	if( iOffset>0 ){
3828	3870	/* Don't handle LIMIT here, otherwise print_timeline()
		@@ -3847,11 +3889,11 @@
3847	3889	** Query parameters:
3848	3890	**
3849	3891	** today=DATE Use DATE as today's date
3850	3892	*/
3851	3893	void thisdayinhistory_page(void){
3852		- static int aYearsAgo[] = { 1, 2, 3, 4, 5, 10, 15, 20, 30, 40, 50, 75, 100 };
	3894	+ static int aYearsAgo[] = { 1,2,3,4,5,10,15,20,25,30,40,50,75,100 };
3853	3895	const char *zToday;
3854	3896	char *zStartOfProject;
3855	3897	int i;
3856	3898	Stmt q;
3857	3899	char *z;
3858	3900

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1273,11 +1273,11 @@
1273	*/
1274	static void addFileGlobExclusion(
1275	const char zChng, / The filename GLOB list */
1276	Blob pSql / The SELECT statement under construction */
1277	){
1278	if( zChng==0 \|\| zChng[0]==0 ) return;
1279	blob_append_sql(pSql," AND event.objid IN ("
1280	"SELECT mlink.mid FROM mlink, filename\n"
1281	" WHERE mlink.fnid=filename.fnid\n"
1282	" AND %s)",
1283	glob_expr("filename.name", mprintf("\"%s\"", zChng)));
	@@ -1284,14 +1284,33 @@
1284	}
1285	static void addFileGlobDescription(
1286	const char zChng, / The filename GLOB list */
1287	Blob pDescription / Result description */
1288	){
1289	if( zChng==0 \|\| zChng[0]==0 ) return;
1290	blob_appendf(pDescription, " that include changes to files matching '%h'",
1291	zChng);
1292	}



















1293
1294	/*
1295	** Similar to fossil_expand_datetime()
1296	**
1297	** Add missing "-" characters into a date/time. Examples:
	@@ -1777,10 +1796,11 @@
1777	nEntry = 0;
1778	useDividers = 0;
1779	cgi_replace_query_parameter("d",fossil_strdup(z));
1780	zDPNameD = zDPNameP = z;
1781	}

1782
1783	/* Undocumented query parameter to set JS mode */
1784	builtin_set_js_delivery_mode(P("jsmode"),1);
1785
1786	secondaryRid = name_to_typed_rid(P("sel2"),"ci");
	@@ -2174,12 +2194,14 @@
2174	);
2175	}
2176	db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related");
2177	}
2178	add_extra_rids("pathnode",P("x"));


2179	blob_append_sql(&sql, " AND event.objid IN pathnode");
2180	if( zChng && zChng[0] ){
2181	db_multi_exec(
2182	"DELETE FROM pathnode\n"
2183	" WHERE NOT EXISTS(SELECT 1 FROM mlink, filename\n"
2184	" WHERE mlink.mid=x\n"
2185	" AND mlink.fnid=filename.fnid\n"
	@@ -2248,10 +2270,12 @@
2248	}
2249	db_multi_exec(
2250	"CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)"
2251	);
2252	add_extra_rids("ok", P("x"));


2253	blob_append_sql(&sql, " AND event.objid IN ok");
2254	nd = 0;
2255	if( d_rid ){
2256	double rStopTime = 9e99;
2257	zFwdTo = P("ft");
	@@ -2299,14 +2323,16 @@
2299	db_multi_exec(
2300	"INSERT INTO ok_d SELECT rid FROM ok;"
2301	"DELETE FROM ok;"
2302	);
2303	}else{

2304	nd = db_int(0, "SELECT count(*)-1 FROM ok");
2305	if( nd>=0 ) db_multi_exec("%s", blob_sql_text(&sql));
2306	if( nd>0 \|\| p_rid==0 ){
2307	blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s");

2308	}
2309	if( useDividers && !selectedRid ) selectedRid = d_rid;
2310	db_multi_exec("DELETE FROM ok");
2311	}
2312	}
	@@ -2335,30 +2361,34 @@
2335	db_multi_exec("INSERT OR IGNORE INTO ok VALUES(%d)", ridBackTo);
2336	bBackAdded = 1;
2337	}
2338	if( bSeparateDandP ){
2339	db_multi_exec("DELETE FROM ok WHERE rid NOT IN ok_d;");

2340	db_multi_exec("%s", blob_sql_text(&sql));
2341	}else{

2342	np = db_int(0, "SELECT count(*)-1 FROM ok");
2343	if( np>0 \|\| nd==0 ){
2344	if( nd>0 ) blob_appendf(&desc, " and ");
2345	blob_appendf(&desc, "%d ancestor%s", np, (1==np)?"":"s");

2346	db_multi_exec("%s", blob_sql_text(&sql));
2347	}
2348	if( useDividers && !selectedRid ) selectedRid = p_rid;
2349	}
2350	}

2351	if( bSeparateDandP ){
2352	int n = db_int(0, "SELECT count(*) FROM ok");
2353	blob_reset(&desc);
2354	blob_appendf(&desc,
2355	"%d check-ins that are both ancestors of %z%h</a>"
2356	" and descendants of %z%h</a>",
2357	n,
2358	href("%R/info?name=%h",zDPNameP),zDPNameP,
2359	href("%R/info?name=%h",zDPNameD),zDPNameD
2360	);
2361	ridBackTo = 0;
2362	ridFwdTo = 0;
2363	}else{
2364	blob_appendf(&desc, " of %z%h</a>",
	@@ -2392,10 +2422,14 @@
2392	blob_appendf(&desc, " up to %z%h</a>%s",
2393	href("%R/info?name=%h",zFwdTo), zFwdTo,
2394	bFwdAdded ? " (not a direct descendant)":"");
2395	}
2396	}




2397	if( advancedMenu ){
2398	style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0);
2399	}
2400	style_submenu_entry("n","Max:",4,0);
2401	timeline_y_submenu(1);
	@@ -2730,10 +2764,12 @@
2730	int ridMark = name_to_rid(zMark);
2731	db_multi_exec(
2732	"INSERT OR IGNORE INTO selected_nodes(rid) VALUES(%d)", ridMark);
2733	}
2734	add_extra_rids("selected_nodes",P("x"));


2735	if( related==0 ){
2736	blob_append_sql(&cond, " AND blob.rid IN selected_nodes");
2737	}else{
2738	db_multi_exec(
2739	"CREATE TEMP TABLE related_nodes(rid INTEGER PRIMARY KEY);"
	@@ -3816,13 +3852,19 @@
3816	" AND (tagxref.value IS NULL OR tagxref.value='%q')",
3817	zBr, zBr, zBr, TAG_BRANCH, zBr, zBr);
3818	}
3819
3820	if( mode==TIMELINE_MODE_AFTER ){






3821	/* Complete the above outer select. */
3822	blob_append_sql(&sql,
3823	"\nORDER BY event.mtime LIMIT abs(%d)) t ORDER BY t.mDateTime DESC;", n);
3824	}else{
3825	blob_append_sql(&sql, "\nORDER BY event.mtime DESC");
3826	}
3827	if( iOffset>0 ){
3828	/* Don't handle LIMIT here, otherwise print_timeline()
	@@ -3847,11 +3889,11 @@
3847	** Query parameters:
3848	**
3849	** today=DATE Use DATE as today's date
3850	*/
3851	void thisdayinhistory_page(void){
3852	static int aYearsAgo[] = { 1, 2, 3, 4, 5, 10, 15, 20, 30, 40, 50, 75, 100 };
3853	const char *zToday;
3854	char *zStartOfProject;
3855	int i;
3856	Stmt q;
3857	char *z;
3858

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1273,11 +1273,11 @@
1273	*/
1274	static void addFileGlobExclusion(
1275	const char zChng, / The filename GLOB list */
1276	Blob pSql / The SELECT statement under construction */
1277	){
1278	if( zChng==0 ) return;
1279	blob_append_sql(pSql," AND event.objid IN ("
1280	"SELECT mlink.mid FROM mlink, filename\n"
1281	" WHERE mlink.fnid=filename.fnid\n"
1282	" AND %s)",
1283	glob_expr("filename.name", mprintf("\"%s\"", zChng)));
	@@ -1284,14 +1284,33 @@
1284	}
1285	static void addFileGlobDescription(
1286	const char zChng, / The filename GLOB list */
1287	Blob pDescription / Result description */
1288	){
1289	if( zChng==0 ) return;
1290	blob_appendf(pDescription, " that include changes to files matching '%h'",
1291	zChng);
1292	}
1293
1294	/*
1295	** If zChng is not NULL, then use it as a comma-separated list of
1296	** glob patterns for filenames, and remove from the "ok" table any
1297	** check-ins that do not modify one or more of the files identified
1298	** by zChng.
1299	*/
1300	static void removeFileGlobFromOk(
1301	const char zChng / The filename GLOB list */
1302	){
1303	if( zChng==0 ) return;
1304	db_multi_exec(
1305	"DELETE FROM ok WHERE rid NOT IN (\n"
1306	" SELECT mlink.mid FROM mlink, filename\n"
1307	" WHERE mlink.fnid=filename.fnid\n"
1308	" AND %z);\n",
1309	glob_expr("filename.name", zChng)
1310	);
1311	}
1312
1313	/*
1314	** Similar to fossil_expand_datetime()
1315	**
1316	** Add missing "-" characters into a date/time. Examples:
	@@ -1777,10 +1796,11 @@
1796	nEntry = 0;
1797	useDividers = 0;
1798	cgi_replace_query_parameter("d",fossil_strdup(z));
1799	zDPNameD = zDPNameP = z;
1800	}
1801	if( zChng && zChng[0]==0 ) zChng = 0;
1802
1803	/* Undocumented query parameter to set JS mode */
1804	builtin_set_js_delivery_mode(P("jsmode"),1);
1805
1806	secondaryRid = name_to_typed_rid(P("sel2"),"ci");
	@@ -2174,12 +2194,14 @@
2194	);
2195	}
2196	db_multi_exec("INSERT OR IGNORE INTO pathnode SELECT x FROM related");
2197	}
2198	add_extra_rids("pathnode",P("x"));
2199	add_extra_rids("pathnode",P("sel1"));
2200	add_extra_rids("pathnode",P("sel2"));
2201	blob_append_sql(&sql, " AND event.objid IN pathnode");
2202	if( zChng ){
2203	db_multi_exec(
2204	"DELETE FROM pathnode\n"
2205	" WHERE NOT EXISTS(SELECT 1 FROM mlink, filename\n"
2206	" WHERE mlink.mid=x\n"
2207	" AND mlink.fnid=filename.fnid\n"
	@@ -2248,10 +2270,12 @@
2270	}
2271	db_multi_exec(
2272	"CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)"
2273	);
2274	add_extra_rids("ok", P("x"));
2275	add_extra_rids("ok", P("sel1"));
2276	add_extra_rids("ok", P("sel2"));
2277	blob_append_sql(&sql, " AND event.objid IN ok");
2278	nd = 0;
2279	if( d_rid ){
2280	double rStopTime = 9e99;
2281	zFwdTo = P("ft");
	@@ -2299,14 +2323,16 @@
2323	db_multi_exec(
2324	"INSERT INTO ok_d SELECT rid FROM ok;"
2325	"DELETE FROM ok;"
2326	);
2327	}else{
2328	removeFileGlobFromOk(zChng);
2329	nd = db_int(0, "SELECT count(*)-1 FROM ok");
2330	if( nd>=0 ) db_multi_exec("%s", blob_sql_text(&sql));
2331	if( nd>0 \|\| p_rid==0 ){
2332	blob_appendf(&desc, "%d descendant%s",
2333	nd>=0 ? nd : 0,(1==nd)?"":"s");
2334	}
2335	if( useDividers && !selectedRid ) selectedRid = d_rid;
2336	db_multi_exec("DELETE FROM ok");
2337	}
2338	}
	@@ -2335,30 +2361,34 @@
2361	db_multi_exec("INSERT OR IGNORE INTO ok VALUES(%d)", ridBackTo);
2362	bBackAdded = 1;
2363	}
2364	if( bSeparateDandP ){
2365	db_multi_exec("DELETE FROM ok WHERE rid NOT IN ok_d;");
2366	removeFileGlobFromOk(zChng);
2367	db_multi_exec("%s", blob_sql_text(&sql));
2368	}else{
2369	removeFileGlobFromOk(zChng);
2370	np = db_int(0, "SELECT count(*)-1 FROM ok");
2371	if( np>0 \|\| nd==0 ){
2372	if( nd>0 ) blob_appendf(&desc, " and ");
2373	blob_appendf(&desc, "%d ancestor%s",
2374	np>=0 ? np : 0, (1==np)?"":"s");
2375	db_multi_exec("%s", blob_sql_text(&sql));
2376	}
2377	if( useDividers && !selectedRid ) selectedRid = p_rid;
2378	}
2379	}
2380
2381	if( bSeparateDandP ){
2382	int n = db_int(0, "SELECT count(*) FROM ok");
2383	blob_reset(&desc);
2384	blob_appendf(&desc,
2385	"%d check-ins that are derived from %z%h</a>"
2386	" and contribute to %z%h</a>",
2387	n,
2388	href("%R/info?name=%h",zDPNameD),zDPNameD,
2389	href("%R/info?name=%h",zDPNameP),zDPNameP
2390	);
2391	ridBackTo = 0;
2392	ridFwdTo = 0;
2393	}else{
2394	blob_appendf(&desc, " of %z%h</a>",
	@@ -2392,10 +2422,14 @@
2422	blob_appendf(&desc, " up to %z%h</a>%s",
2423	href("%R/info?name=%h",zFwdTo), zFwdTo,
2424	bFwdAdded ? " (not a direct descendant)":"");
2425	}
2426	}
2427	if( zChng ){
2428	if( strstr(blob_str(&desc)," that ") ) blob_appendf(&desc, " and");
2429	blob_appendf(&desc, " that make changes to files matching \"%h\"", zChng);
2430	}
2431	if( advancedMenu ){
2432	style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0);
2433	}
2434	style_submenu_entry("n","Max:",4,0);
2435	timeline_y_submenu(1);
	@@ -2730,10 +2764,12 @@
2764	int ridMark = name_to_rid(zMark);
2765	db_multi_exec(
2766	"INSERT OR IGNORE INTO selected_nodes(rid) VALUES(%d)", ridMark);
2767	}
2768	add_extra_rids("selected_nodes",P("x"));
2769	add_extra_rids("selected_nodes",P("sel1"));
2770	add_extra_rids("selected_nodes",P("sel2"));
2771	if( related==0 ){
2772	blob_append_sql(&cond, " AND blob.rid IN selected_nodes");
2773	}else{
2774	db_multi_exec(
2775	"CREATE TEMP TABLE related_nodes(rid INTEGER PRIMARY KEY);"
	@@ -3816,13 +3852,19 @@
3852	" AND (tagxref.value IS NULL OR tagxref.value='%q')",
3853	zBr, zBr, zBr, TAG_BRANCH, zBr, zBr);
3854	}
3855
3856	if( mode==TIMELINE_MODE_AFTER ){
3857	int lim = n;
3858	if( n == 0 ){
3859	lim = -1; /* 0 means no limit */
3860	}else if( n < 0 ){
3861	lim = -n;
3862	}
3863	/* Complete the above outer select. */
3864	blob_append_sql(&sql,
3865	"\nORDER BY event.mtime LIMIT %d) t ORDER BY t.mDateTime DESC;", lim);
3866	}else{
3867	blob_append_sql(&sql, "\nORDER BY event.mtime DESC");
3868	}
3869	if( iOffset>0 ){
3870	/* Don't handle LIMIT here, otherwise print_timeline()
	@@ -3847,11 +3889,11 @@
3889	** Query parameters:
3890	**
3891	** today=DATE Use DATE as today's date
3892	*/
3893	void thisdayinhistory_page(void){
3894	static int aYearsAgo[] = { 1,2,3,4,5,10,15,20,25,30,40,50,75,100 };
3895	const char *zToday;
3896	char *zStartOfProject;
3897	int i;
3898	Stmt q;
3899	char *z;
3900

M src/tkt.c

-4

		--- src/tkt.c
		+++ src/tkt.c
		@@ -776,14 +776,10 @@
776	776	style_submenu_element("Timeline", "%R/info/%T", zUuid);
777	777	}
778	778	zFullName = db_text(0,
779	779	"SELECT tkt_uuid FROM ticket"
780	780	" WHERE tkt_uuid GLOB '%q*'", zUuid);
781		- if( g.perm.WrWiki && g.perm.WrTkt ){
782		- style_submenu_element("Edit Description",
783		- "%R/wikiedit?name=ticket/%T", zFullName);
784		- }
785	781	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1);
786	782	ticket_init();
787	783	initializeVariablesFromCGI();
788	784	getAllTicketFields();
789	785	initializeVariablesFromDb();
790	786

	--- src/tkt.c
	+++ src/tkt.c
	@@ -776,14 +776,10 @@
776	style_submenu_element("Timeline", "%R/info/%T", zUuid);
777	}
778	zFullName = db_text(0,
779	"SELECT tkt_uuid FROM ticket"
780	" WHERE tkt_uuid GLOB '%q*'", zUuid);
781	if( g.perm.WrWiki && g.perm.WrTkt ){
782	style_submenu_element("Edit Description",
783	"%R/wikiedit?name=ticket/%T", zFullName);
784	}
785	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1);
786	ticket_init();
787	initializeVariablesFromCGI();
788	getAllTicketFields();
789	initializeVariablesFromDb();
790

	--- src/tkt.c
	+++ src/tkt.c
	@@ -776,14 +776,10 @@
776	style_submenu_element("Timeline", "%R/info/%T", zUuid);
777	}
778	zFullName = db_text(0,
779	"SELECT tkt_uuid FROM ticket"
780	" WHERE tkt_uuid GLOB '%q*'", zUuid);




781	if( g.thTrace ) Th_Trace("BEGIN_TKTVIEW<br>\n", -1);
782	ticket_init();
783	initializeVariablesFromCGI();
784	getAllTicketFields();
785	initializeVariablesFromDb();
786

M src/tktsetup.c

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -496,10 +496,13 @@
496	496	@ }
497	497	@
498	498	@ if {[capexpr {n}]} {
499	499	@ submenu link "Copy Ticket" /tktnew/$tkt_uuid
500	500	@ }
	501	+@ if {[capexpr {nk}]} {
	502	+@ submenu link "Edit Wiki" /wikiedit?name=ticket/$tkt_uuid
	503	+@ }
501	504	@ </th1>
502	505	@ <tr><td class="tktDspLabel">Title:</td>
503	506	@ <td class="tktDspValue" colspan="3">
504	507	@ $<title>
505	508	@ </td></tr>
506	509

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -496,10 +496,13 @@
496	@ }
497	@
498	@ if {[capexpr {n}]} {
499	@ submenu link "Copy Ticket" /tktnew/$tkt_uuid
500	@ }



501	@ </th1>
502	@ <tr><td class="tktDspLabel">Title:</td>
503	@ <td class="tktDspValue" colspan="3">
504	@ $<title>
505	@ </td></tr>
506

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -496,10 +496,13 @@
496	@ }
497	@
498	@ if {[capexpr {n}]} {
499	@ submenu link "Copy Ticket" /tktnew/$tkt_uuid
500	@ }
501	@ if {[capexpr {nk}]} {
502	@ submenu link "Edit Wiki" /wikiedit?name=ticket/$tkt_uuid
503	@ }
504	@ </th1>
505	@ <tr><td class="tktDspLabel">Title:</td>
506	@ <td class="tktDspValue" colspan="3">
507	@ $<title>
508	@ </td></tr>
509

M src/wiki.c

+4 -1

		--- src/wiki.c
		+++ src/wiki.c
		@@ -2583,11 +2583,14 @@
2583	2583	static void wiki_submenu_to_read_wiki(
2584	2584	const char zPrefix, / "branch", "tag", or "checkin" */
2585	2585	const char zName, / Name of the object */
2586	2586	unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
2587	2587	){
2588		- if( g.perm.RdWiki && (mFlags & WIKIASSOC_MENU_READ)!=0 ){
	2588	+ if( g.perm.RdWiki && (mFlags & WIKIASSOC_MENU_READ)!=0
	2589	+ && 0!=fossil_strcmp("branch", zPrefix)
	2590	+ /* ^^^ https://fossil-scm.org/forum/forumpost/ff453de2f30791dd */
	2591	+ ){
2589	2592	style_submenu_element("Wiki", "%R/wiki?name=%s/%t", zPrefix, zName);
2590	2593	}
2591	2594	}
2592	2595
2593	2596	/*
2594	2597

	--- src/wiki.c
	+++ src/wiki.c
	@@ -2583,11 +2583,14 @@
2583	static void wiki_submenu_to_read_wiki(
2584	const char zPrefix, / "branch", "tag", or "checkin" */
2585	const char zName, / Name of the object */
2586	unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
2587	){
2588	if( g.perm.RdWiki && (mFlags & WIKIASSOC_MENU_READ)!=0 ){



2589	style_submenu_element("Wiki", "%R/wiki?name=%s/%t", zPrefix, zName);
2590	}
2591	}
2592
2593	/*
2594

	--- src/wiki.c
	+++ src/wiki.c
	@@ -2583,11 +2583,14 @@
2583	static void wiki_submenu_to_read_wiki(
2584	const char zPrefix, / "branch", "tag", or "checkin" */
2585	const char zName, / Name of the object */
2586	unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
2587	){
2588	if( g.perm.RdWiki && (mFlags & WIKIASSOC_MENU_READ)!=0
2589	&& 0!=fossil_strcmp("branch", zPrefix)
2590	/* ^^^ https://fossil-scm.org/forum/forumpost/ff453de2f30791dd */
2591	){
2592	style_submenu_element("Wiki", "%R/wiki?name=%s/%t", zPrefix, zName);
2593	}
2594	}
2595
2596	/*
2597

M src/winfile.c

+34 -19

		--- src/winfile.c
		+++ src/winfile.c
		@@ -304,39 +304,47 @@
304	304	*/
305	305	int win32_filenames_equal_nocase(
306	306	const wchar_t *fn1,
307	307	const wchar_t *fn2
308	308	){
309		- static FARPROC fnCompareStringOrdinal;
310		- static FARPROC fnRtlInitUnicodeString;
311		- static FARPROC fnRtlEqualUnicodeString;
	309	+ /* ---- Data types used by dynamically loaded API functions. -------------- */
	310	+ typedef struct { /* UNICODE_STRING from <ntdef.h> */
	311	+ USHORT Length;
	312	+ USHORT MaximumLength;
	313	+ PWSTR Buffer;
	314	+ } MY_UNICODE_STRING;
	315	+ /* ---- Prototypes for dynamically loaded API functions. ------------------ */
	316	+ typedef int (WINAPI *FNCOMPARESTRINGORDINAL)(LPCWCH,int,LPCWCH,int,BOOL);
	317	+ typedef VOID (NTAPI FNRTLINITUNICODESTRING)(MY_UNICODE_STRING,PCWSTR);
	318	+ typedef BOOLEAN (NTAPI *FNRTLEQUALUNICODESTRING)
	319	+ (MY_UNICODE_STRING,MY_UNICODE_STRING,BOOLEAN);
	320	+ /* ------------------------------------------------------------------------ */
	321	+ static FNCOMPARESTRINGORDINAL fnCompareStringOrdinal;
	322	+ static FNRTLINITUNICODESTRING fnRtlInitUnicodeString;
	323	+ static FNRTLEQUALUNICODESTRING fnRtlEqualUnicodeString;
312	324	static int loaded_CompareStringOrdinal;
313	325	static int loaded_RtlUnicodeStringAPIs;
314	326	if( !loaded_CompareStringOrdinal ){
315		- fnCompareStringOrdinal =
	327	+ fnCompareStringOrdinal = (FNCOMPARESTRINGORDINAL)
316	328	GetProcAddress(GetModuleHandleA("kernel32"),"CompareStringOrdinal");
317	329	loaded_CompareStringOrdinal = 1;
318	330	}
319	331	if( fnCompareStringOrdinal ){
320	332	return fnCompareStringOrdinal(fn1,-1,fn2,-1,1)-2==0;
321	333	}
322	334	if( !loaded_RtlUnicodeStringAPIs ){
323		- fnRtlInitUnicodeString =
	335	+ fnRtlInitUnicodeString = (FNRTLINITUNICODESTRING)
324	336	GetProcAddress(GetModuleHandleA("ntdll"),"RtlInitUnicodeString");
325		- fnRtlEqualUnicodeString =
	337	+ fnRtlEqualUnicodeString = (FNRTLEQUALUNICODESTRING)
326	338	GetProcAddress(GetModuleHandleA("ntdll"),"RtlEqualUnicodeString");
327	339	loaded_RtlUnicodeStringAPIs = 1;
328	340	}
329	341	if( fnRtlInitUnicodeString && fnRtlEqualUnicodeString ){
330		- struct { /* UNICODE_STRING from <ntdef.h> */
331		- unsigned short Length;
332		- unsigned short MaximumLength;
333		- wchar_t *Buffer;
334		- } u1, u2;
	342	+ MY_UNICODE_STRING u1, u2;
335	343	fnRtlInitUnicodeString(&u1,fn1);
336	344	fnRtlInitUnicodeString(&u2,fn2);
337		- return (unsigned char)fnRtlEqualUnicodeString(&u1,&u2,1);
	345	+ return (BOOLEAN/unsigned char/)fnRtlEqualUnicodeString(&u1,&u2,1);
338	346	}
339	347	/* In what kind of strange parallel universe are we? */
340	348	return lstrcmpiW(fn1,fn2)==0;
341	349	}
342	350
		@@ -461,11 +469,20 @@
461	469	** is allocated by mprintf(), or NULL on failure.
462	470	*/
463	471	char *win32_file_id(
464	472	const char *zFileName
465	473	){
466		- static FARPROC fnGetFileInformationByHandleEx;
	474	+ /* ---- Data types used by dynamically loaded API functions. -------------- */
	475	+ typedef struct { /* FILE_ID_INFO from <winbase.h> */
	476	+ ULONGLONG VolumeSerialNumber;
	477	+ BYTE FileId[16];
	478	+ } MY_FILE_ID_INFO;
	479	+ /* ---- Prototypes for dynamically loaded API functions. ------------------ */
	480	+ typedef int (WINAPI *FNGETFILEINFORMATIONBYHANDLEEX)
	481	+ (HANDLE,int/enum/,MY_FILE_ID_INFO*,DWORD);
	482	+ /* ------------------------------------------------------------------------ */
	483	+ static FNGETFILEINFORMATIONBYHANDLEEX fnGetFileInformationByHandleEx;
467	484	static int loaded_fnGetFileInformationByHandleEx;
468	485	wchar_t *wzFileName = fossil_utf8_to_path(zFileName,0);
469	486	HANDLE hFile;
470	487	char *zFileId = 0;
471	488	hFile = CreateFileW(
		@@ -476,17 +493,15 @@
476	493	OPEN_EXISTING,
477	494	FILE_FLAG_BACKUP_SEMANTICS,
478	495	NULL);
479	496	if( hFile!=INVALID_HANDLE_VALUE ){
480	497	BY_HANDLE_FILE_INFORMATION fi;
481		- struct { /* FILE_ID_INFO from <winbase.h> */
482		- u64 VolumeSerialNumber;
483		- unsigned char FileId[16];
484		- } fi2;
	498	+ MY_FILE_ID_INFO fi2;
485	499	if( !loaded_fnGetFileInformationByHandleEx ){
486		- fnGetFileInformationByHandleEx = GetProcAddress(
487		- GetModuleHandleA("kernel32"),"GetFileInformationByHandleEx");
	500	+ fnGetFileInformationByHandleEx = (FNGETFILEINFORMATIONBYHANDLEEX)
	501	+ GetProcAddress(
	502	+ GetModuleHandleA("kernel32"),"GetFileInformationByHandleEx");
488	503	loaded_fnGetFileInformationByHandleEx = 1;
489	504	}
490	505	if( fnGetFileInformationByHandleEx ){
491	506	if( fnGetFileInformationByHandleEx(
492	507	hFile,/FileIdInfo/0x12,&fi2,sizeof(fi2)) ){
493	508

	--- src/winfile.c
	+++ src/winfile.c
	@@ -304,39 +304,47 @@
304	*/
305	int win32_filenames_equal_nocase(
306	const wchar_t *fn1,
307	const wchar_t *fn2
308	){
309	static FARPROC fnCompareStringOrdinal;
310	static FARPROC fnRtlInitUnicodeString;
311	static FARPROC fnRtlEqualUnicodeString;












312	static int loaded_CompareStringOrdinal;
313	static int loaded_RtlUnicodeStringAPIs;
314	if( !loaded_CompareStringOrdinal ){
315	fnCompareStringOrdinal =
316	GetProcAddress(GetModuleHandleA("kernel32"),"CompareStringOrdinal");
317	loaded_CompareStringOrdinal = 1;
318	}
319	if( fnCompareStringOrdinal ){
320	return fnCompareStringOrdinal(fn1,-1,fn2,-1,1)-2==0;
321	}
322	if( !loaded_RtlUnicodeStringAPIs ){
323	fnRtlInitUnicodeString =
324	GetProcAddress(GetModuleHandleA("ntdll"),"RtlInitUnicodeString");
325	fnRtlEqualUnicodeString =
326	GetProcAddress(GetModuleHandleA("ntdll"),"RtlEqualUnicodeString");
327	loaded_RtlUnicodeStringAPIs = 1;
328	}
329	if( fnRtlInitUnicodeString && fnRtlEqualUnicodeString ){
330	struct { /* UNICODE_STRING from <ntdef.h> */
331	unsigned short Length;
332	unsigned short MaximumLength;
333	wchar_t *Buffer;
334	} u1, u2;
335	fnRtlInitUnicodeString(&u1,fn1);
336	fnRtlInitUnicodeString(&u2,fn2);
337	return (unsigned char)fnRtlEqualUnicodeString(&u1,&u2,1);
338	}
339	/* In what kind of strange parallel universe are we? */
340	return lstrcmpiW(fn1,fn2)==0;
341	}
342
	@@ -461,11 +469,20 @@
461	** is allocated by mprintf(), or NULL on failure.
462	*/
463	char *win32_file_id(
464	const char *zFileName
465	){
466	static FARPROC fnGetFileInformationByHandleEx;









467	static int loaded_fnGetFileInformationByHandleEx;
468	wchar_t *wzFileName = fossil_utf8_to_path(zFileName,0);
469	HANDLE hFile;
470	char *zFileId = 0;
471	hFile = CreateFileW(
	@@ -476,17 +493,15 @@
476	OPEN_EXISTING,
477	FILE_FLAG_BACKUP_SEMANTICS,
478	NULL);
479	if( hFile!=INVALID_HANDLE_VALUE ){
480	BY_HANDLE_FILE_INFORMATION fi;
481	struct { /* FILE_ID_INFO from <winbase.h> */
482	u64 VolumeSerialNumber;
483	unsigned char FileId[16];
484	} fi2;
485	if( !loaded_fnGetFileInformationByHandleEx ){
486	fnGetFileInformationByHandleEx = GetProcAddress(
487	GetModuleHandleA("kernel32"),"GetFileInformationByHandleEx");

488	loaded_fnGetFileInformationByHandleEx = 1;
489	}
490	if( fnGetFileInformationByHandleEx ){
491	if( fnGetFileInformationByHandleEx(
492	hFile,/FileIdInfo/0x12,&fi2,sizeof(fi2)) ){
493

	--- src/winfile.c
	+++ src/winfile.c
	@@ -304,39 +304,47 @@
304	*/
305	int win32_filenames_equal_nocase(
306	const wchar_t *fn1,
307	const wchar_t *fn2
308	){
309	/* ---- Data types used by dynamically loaded API functions. -------------- */
310	typedef struct { /* UNICODE_STRING from <ntdef.h> */
311	USHORT Length;
312	USHORT MaximumLength;
313	PWSTR Buffer;
314	} MY_UNICODE_STRING;
315	/* ---- Prototypes for dynamically loaded API functions. ------------------ */
316	typedef int (WINAPI *FNCOMPARESTRINGORDINAL)(LPCWCH,int,LPCWCH,int,BOOL);
317	typedef VOID (NTAPI FNRTLINITUNICODESTRING)(MY_UNICODE_STRING,PCWSTR);
318	typedef BOOLEAN (NTAPI *FNRTLEQUALUNICODESTRING)
319	(MY_UNICODE_STRING,MY_UNICODE_STRING,BOOLEAN);
320	/* ------------------------------------------------------------------------ */
321	static FNCOMPARESTRINGORDINAL fnCompareStringOrdinal;
322	static FNRTLINITUNICODESTRING fnRtlInitUnicodeString;
323	static FNRTLEQUALUNICODESTRING fnRtlEqualUnicodeString;
324	static int loaded_CompareStringOrdinal;
325	static int loaded_RtlUnicodeStringAPIs;
326	if( !loaded_CompareStringOrdinal ){
327	fnCompareStringOrdinal = (FNCOMPARESTRINGORDINAL)
328	GetProcAddress(GetModuleHandleA("kernel32"),"CompareStringOrdinal");
329	loaded_CompareStringOrdinal = 1;
330	}
331	if( fnCompareStringOrdinal ){
332	return fnCompareStringOrdinal(fn1,-1,fn2,-1,1)-2==0;
333	}
334	if( !loaded_RtlUnicodeStringAPIs ){
335	fnRtlInitUnicodeString = (FNRTLINITUNICODESTRING)
336	GetProcAddress(GetModuleHandleA("ntdll"),"RtlInitUnicodeString");
337	fnRtlEqualUnicodeString = (FNRTLEQUALUNICODESTRING)
338	GetProcAddress(GetModuleHandleA("ntdll"),"RtlEqualUnicodeString");
339	loaded_RtlUnicodeStringAPIs = 1;
340	}
341	if( fnRtlInitUnicodeString && fnRtlEqualUnicodeString ){
342	MY_UNICODE_STRING u1, u2;




343	fnRtlInitUnicodeString(&u1,fn1);
344	fnRtlInitUnicodeString(&u2,fn2);
345	return (BOOLEAN/unsigned char/)fnRtlEqualUnicodeString(&u1,&u2,1);
346	}
347	/* In what kind of strange parallel universe are we? */
348	return lstrcmpiW(fn1,fn2)==0;
349	}
350
	@@ -461,11 +469,20 @@
469	** is allocated by mprintf(), or NULL on failure.
470	*/
471	char *win32_file_id(
472	const char *zFileName
473	){
474	/* ---- Data types used by dynamically loaded API functions. -------------- */
475	typedef struct { /* FILE_ID_INFO from <winbase.h> */
476	ULONGLONG VolumeSerialNumber;
477	BYTE FileId[16];
478	} MY_FILE_ID_INFO;
479	/* ---- Prototypes for dynamically loaded API functions. ------------------ */
480	typedef int (WINAPI *FNGETFILEINFORMATIONBYHANDLEEX)
481	(HANDLE,int/enum/,MY_FILE_ID_INFO*,DWORD);
482	/* ------------------------------------------------------------------------ */
483	static FNGETFILEINFORMATIONBYHANDLEEX fnGetFileInformationByHandleEx;
484	static int loaded_fnGetFileInformationByHandleEx;
485	wchar_t *wzFileName = fossil_utf8_to_path(zFileName,0);
486	HANDLE hFile;
487	char *zFileId = 0;
488	hFile = CreateFileW(
	@@ -476,17 +493,15 @@
493	OPEN_EXISTING,
494	FILE_FLAG_BACKUP_SEMANTICS,
495	NULL);
496	if( hFile!=INVALID_HANDLE_VALUE ){
497	BY_HANDLE_FILE_INFORMATION fi;
498	MY_FILE_ID_INFO fi2;



499	if( !loaded_fnGetFileInformationByHandleEx ){
500	fnGetFileInformationByHandleEx = (FNGETFILEINFORMATIONBYHANDLEEX)
501	GetProcAddress(
502	GetModuleHandleA("kernel32"),"GetFileInformationByHandleEx");
503	loaded_fnGetFileInformationByHandleEx = 1;
504	}
505	if( fnGetFileInformationByHandleEx ){
506	if( fnGetFileInformationByHandleEx(
507	hFile,/FileIdInfo/0x12,&fi2,sizeof(fi2)) ){
508

M src/xfer.c

+4 -2

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1523,10 +1523,11 @@
1523	1523	cgi_set_content_type("application/x-fossil-uncompressed");
1524	1524	}
1525	1525	blob_is_int(&xfer.aToken[2], &seqno);
1526	1526	if( seqno<=0 ){
1527	1527	xfer_fatal_error("invalid clone sequence number");
	1528	+ db_rollback_transaction();
1528	1529	return;
1529	1530	}
1530	1531	max = db_int(0, "SELECT max(rid) FROM blob");
1531	1532	while( xfer.mxSend>(int)blob_size(xfer.pOut) && seqno<=max){
1532	1533	if( time(NULL) >= xfer.maxTime ) break;
		@@ -1598,10 +1599,11 @@
1598	1599	&& blob_is_int(&xfer.aToken[2], &size) ){
1599	1600	const char *zName = blob_str(&xfer.aToken[1]);
1600	1601	Blob content;
1601	1602	if( size<0 ){
1602	1603	xfer_fatal_error("invalid config record");
	1604	+ db_rollback_transaction();
1603	1605	return;
1604	1606	}
1605	1607	blob_zero(&content);
1606	1608	blob_extract(xfer.pIn, size, &content);
1607	1609	if( !g.perm.Admin ){
		@@ -2382,17 +2384,17 @@
2382	2384	if( nCycle==0 && db_is_writeable("repository") ){
2383	2385	xfer_syncwith(g.url.canonical, 0);
2384	2386	}
2385	2387
2386	2388	/* Output current stats */
	2389	+ nRoundtrip++;
	2390	+ nArtifactSent += xfer.nFileSent + xfer.nDeltaSent;
2387	2391	if( syncFlags & SYNC_VERBOSE ){
2388	2392	fossil_print(zValueFormat /works-like:"%s%d%d%d%d"/, "Sent:",
2389	2393	blob_size(&send), nCardSent+xfer.nGimmeSent+xfer.nIGotSent,
2390	2394	xfer.nFileSent, xfer.nDeltaSent);
2391	2395	}else{
2392		- nRoundtrip++;
2393		- nArtifactSent += xfer.nFileSent + xfer.nDeltaSent;
2394	2396	if( bOutIsTty!=0 ){
2395	2397	fossil_print(zBriefFormat /works-like:"%d%d%d"/,
2396	2398	nRoundtrip, nArtifactSent, nArtifactRcvd);
2397	2399	}
2398	2400	}
2399	2401

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1523,10 +1523,11 @@
1523	cgi_set_content_type("application/x-fossil-uncompressed");
1524	}
1525	blob_is_int(&xfer.aToken[2], &seqno);
1526	if( seqno<=0 ){
1527	xfer_fatal_error("invalid clone sequence number");

1528	return;
1529	}
1530	max = db_int(0, "SELECT max(rid) FROM blob");
1531	while( xfer.mxSend>(int)blob_size(xfer.pOut) && seqno<=max){
1532	if( time(NULL) >= xfer.maxTime ) break;
	@@ -1598,10 +1599,11 @@
1598	&& blob_is_int(&xfer.aToken[2], &size) ){
1599	const char *zName = blob_str(&xfer.aToken[1]);
1600	Blob content;
1601	if( size<0 ){
1602	xfer_fatal_error("invalid config record");

1603	return;
1604	}
1605	blob_zero(&content);
1606	blob_extract(xfer.pIn, size, &content);
1607	if( !g.perm.Admin ){
	@@ -2382,17 +2384,17 @@
2382	if( nCycle==0 && db_is_writeable("repository") ){
2383	xfer_syncwith(g.url.canonical, 0);
2384	}
2385
2386	/* Output current stats */


2387	if( syncFlags & SYNC_VERBOSE ){
2388	fossil_print(zValueFormat /works-like:"%s%d%d%d%d"/, "Sent:",
2389	blob_size(&send), nCardSent+xfer.nGimmeSent+xfer.nIGotSent,
2390	xfer.nFileSent, xfer.nDeltaSent);
2391	}else{
2392	nRoundtrip++;
2393	nArtifactSent += xfer.nFileSent + xfer.nDeltaSent;
2394	if( bOutIsTty!=0 ){
2395	fossil_print(zBriefFormat /works-like:"%d%d%d"/,
2396	nRoundtrip, nArtifactSent, nArtifactRcvd);
2397	}
2398	}
2399

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1523,10 +1523,11 @@
1523	cgi_set_content_type("application/x-fossil-uncompressed");
1524	}
1525	blob_is_int(&xfer.aToken[2], &seqno);
1526	if( seqno<=0 ){
1527	xfer_fatal_error("invalid clone sequence number");
1528	db_rollback_transaction();
1529	return;
1530	}
1531	max = db_int(0, "SELECT max(rid) FROM blob");
1532	while( xfer.mxSend>(int)blob_size(xfer.pOut) && seqno<=max){
1533	if( time(NULL) >= xfer.maxTime ) break;
	@@ -1598,10 +1599,11 @@
1599	&& blob_is_int(&xfer.aToken[2], &size) ){
1600	const char *zName = blob_str(&xfer.aToken[1]);
1601	Blob content;
1602	if( size<0 ){
1603	xfer_fatal_error("invalid config record");
1604	db_rollback_transaction();
1605	return;
1606	}
1607	blob_zero(&content);
1608	blob_extract(xfer.pIn, size, &content);
1609	if( !g.perm.Admin ){
	@@ -2382,17 +2384,17 @@
2384	if( nCycle==0 && db_is_writeable("repository") ){
2385	xfer_syncwith(g.url.canonical, 0);
2386	}
2387
2388	/* Output current stats */
2389	nRoundtrip++;
2390	nArtifactSent += xfer.nFileSent + xfer.nDeltaSent;
2391	if( syncFlags & SYNC_VERBOSE ){
2392	fossil_print(zValueFormat /works-like:"%s%d%d%d%d"/, "Sent:",
2393	blob_size(&send), nCardSent+xfer.nGimmeSent+xfer.nIGotSent,
2394	xfer.nFileSent, xfer.nDeltaSent);
2395	}else{


2396	if( bOutIsTty!=0 ){
2397	fossil_print(zBriefFormat /works-like:"%d%d%d"/,
2398	nRoundtrip, nArtifactSent, nArtifactRcvd);
2399	}
2400	}
2401

M src/zip.c

+112 -21

		--- src/zip.c
		+++ src/zip.c
		@@ -562,40 +562,128 @@
562	562	fossil_free(azDir);
563	563	nDir = 0;
564	564	azDir = 0;
565	565	}
566	566
	567	+/* Functions found in shell.c */
	568	+extern int sqlite3_fileio_init(sqlite3,char,const sqlite3_api_routines);
	569	+extern int sqlite3_zipfile_init(sqlite3,char,const sqlite3_api_routines);
	570	+
567	571	/*
568	572	** COMMAND: test-filezip
569	573	**
570		-** Generate a ZIP archive specified by the first argument that
571		-** contains files given in the second and subsequent arguments.
	574	+** Usage: %fossil test-filezip [OPTIONS] ZIPFILE [FILENAME...]
	575	+**
	576	+** This command uses Fossil infrastructure or read or create a ZIP
	577	+** archive named by the ZIPFILE argument. With no options, a new
	578	+** ZIP archive is created and there must be at least one FILENAME
	579	+** argument. If the -l option is used, the contents of the named ZIP
	580	+** archive are listed on standard output. With the -x argument, the
	581	+** contents of the ZIP archive are extracted.
	582	+**
	583	+** There are two purposes for this command: (1) To server as a test
	584	+** platform for the Fossil ZIP archive generator, and (2) to provide
	585	+** rudimentary ZIP archive creation capabilities on platforms that do
	586	+** not have the "zip" command installed.
	587	+**
	588	+** Options:
	589	+**
	590	+** -h\|--dereference Follow symlinks
	591	+** -l\|--list List the contents of the ZIP archive
	592	+** -x\|--extract Extract files from a ZIP archive
572	593	*/
573	594	void filezip_cmd(void){
574		- int i;
575		- Blob zip;
576		- Blob file;
577	595	int eFType = SymFILE;
578		- Archive sArchive;
579		- memset(&sArchive, 0, sizeof(Archive));
580		- sArchive.eType = ARCHIVE_ZIP;
581		- sArchive.pBlob = &zip;
582		- if( g.argc<3 ){
583		- usage("ARCHIVE FILE....");
584		- }
	596	+ int doList = 0;
	597	+ int doExtract = 0;
	598	+ char *zArchiveName;
585	599	if( find_option("dereference","h",0)!=0 ){
586	600	eFType = ExtFILE;
587	601	}
588		- zip_open();
589		- for(i=3; i<g.argc; i++){
590		- blob_zero(&file);
591		- blob_read_from_file(&file, g.argv[i], eFType);
592		- zip_add_file(&sArchive, g.argv[i], &file, file_perm(0,eFType));
593		- blob_reset(&file);
594		- }
595		- zip_close(&sArchive);
596		- blob_write_to_file(&zip, g.argv[2]);
	602	+ if( find_option("list","l",0)!=0 ){
	603	+ doList = 1;
	604	+ }
	605	+ if( find_option("extract","x",0)!=0 ){
	606	+ if( doList ){
	607	+ fossil_fatal("incompatible options: -l and -x");
	608	+ }
	609	+ doExtract = 1;
	610	+ }
	611	+ if( g.argc<3 ){
	612	+ usage("ARCHIVE FILES...");
	613	+ }
	614	+ zArchiveName = g.argv[2];
	615	+ sqlite3_open(":memory:", &g.db);
	616	+ if( doList ){
	617	+ /* Do a content listing of a ZIP archive */
	618	+ Stmt q;
	619	+ int nRow = 0;
	620	+ i64 szTotal = 0;
	621	+ if( file_size(zArchiveName, eFType)<0 ){
	622	+ fossil_fatal("No such ZIP archive: %s", zArchiveName);
	623	+ }
	624	+ if( g.argc>3 ){
	625	+ fossil_fatal("extra arguments after \"fossil test-filezip -l ARCHIVE\"");
	626	+ }
	627	+ sqlite3_zipfile_init(g.db, 0, 0);
	628	+ db_multi_exec("CREATE VIRTUAL TABLE z1 USING zipfile(%Q)", zArchiveName);
	629	+ db_prepare(&q, "SELECT sz, datetime(mtime,'unixepoch'), name FROM z1");
	630	+ while( db_step(&q)==SQLITE_ROW ){
	631	+ int sz = db_column_int(&q, 0);
	632	+ szTotal += sz;
	633	+ if( nRow==0 ){
	634	+ fossil_print(" Length Date Time Name\n");
	635	+ fossil_print("--------- ---------- ----- ----\n");
	636	+ }
	637	+ nRow++;
	638	+ fossil_print("%9d %.16s %s\n", sz, db_column_text(&q,1),
	639	+ db_column_text(&q,2));
	640	+ }
	641	+ if( nRow ){
	642	+ fossil_print("--------- --------\n");
	643	+ fossil_print("%9lld %16s %d files\n", szTotal, "", nRow);
	644	+ }
	645	+ db_finalize(&q);
	646	+ }else if( doExtract ){
	647	+ /* Extract files from an existing ZIP archive */
	648	+ if( file_size(zArchiveName, eFType)<0 ){
	649	+ fossil_fatal("No such ZIP archive: %s", zArchiveName);
	650	+ }
	651	+ if( g.argc>3 ){
	652	+ fossil_fatal("extra arguments after \"fossil test-filezip -x ARCHIVE\"");
	653	+ }
	654	+ sqlite3_zipfile_init(g.db, 0, 0);
	655	+ sqlite3_fileio_init(g.db, 0, 0);
	656	+ db_multi_exec("CREATE VIRTUAL TABLE z1 USING zipfile(%Q)", zArchiveName);
	657	+ db_multi_exec("SELECT writefile(name,data) FROM z1");
	658	+ }else{
	659	+ /* Without the -x or -l options, construct a new ZIP archive */
	660	+ int i;
	661	+ Blob zip;
	662	+ Blob file;
	663	+ Archive sArchive;
	664	+ memset(&sArchive, 0, sizeof(Archive));
	665	+ sArchive.eType = ARCHIVE_ZIP;
	666	+ sArchive.pBlob = &zip;
	667	+ if( file_size(zArchiveName, eFType)>0 ){
	668	+ fossil_fatal("ZIP archive %s already exists", zArchiveName);
	669	+ }
	670	+ zip_open();
	671	+ for(i=3; i<g.argc; i++){
	672	+ double rDate;
	673	+ i64 iDate;
	674	+ blob_zero(&file);
	675	+ blob_read_from_file(&file, g.argv[i], eFType);
	676	+ iDate = file_mtime(g.argv[i], eFType);
	677	+ rDate = ((double)iDate)/86400.0 + 2440587.5;
	678	+ zip_set_timedate(rDate);
	679	+ zip_add_file(&sArchive, g.argv[i], &file, file_perm(0,eFType));
	680	+ blob_reset(&file);
	681	+ }
	682	+ zip_close(&sArchive);
	683	+ blob_write_to_file(&zip, g.argv[2]);
	684	+ }
597	685	}
598	686
599	687	/*
600	688	** Given the RID for a manifest, construct a ZIP archive containing
601	689	** all files in the corresponding baseline.
		@@ -927,10 +1015,13 @@
927	1015	login_check_credentials();
928	1016	if( !g.perm.Zip ){ login_needed(g.anon.Zip); return; }
929	1017	if( fossil_strcmp(g.zPath, "sqlar")==0 ){
930	1018	eType = ARCHIVE_SQLAR;
931	1019	zType = "SQL";
	1020	+ /* For some reason, SQL-archives are like catnip for robots. So
	1021	+ ** don't allow them to be downloaded by user "nobody" */
	1022	+ if( g.zLogin==0 ){ login_needed(g.anon.Zip); return; }
932	1023	}else{
933	1024	eType = ARCHIVE_ZIP;
934	1025	zType = "ZIP";
935	1026	}
936	1027	fossil_nice_default();
937	1028
938	1029	ADDED test/link-tester.html
939	1030	ADDED test/link-tester.js
940	1031	ADDED test/link-tester.json

	--- src/zip.c
	+++ src/zip.c
	@@ -562,40 +562,128 @@
562	fossil_free(azDir);
563	nDir = 0;
564	azDir = 0;
565	}
566




567	/*
568	** COMMAND: test-filezip
569	**
570	** Generate a ZIP archive specified by the first argument that
571	** contains files given in the second and subsequent arguments.

















572	*/
573	void filezip_cmd(void){
574	int i;
575	Blob zip;
576	Blob file;
577	int eFType = SymFILE;
578	Archive sArchive;
579	memset(&sArchive, 0, sizeof(Archive));
580	sArchive.eType = ARCHIVE_ZIP;
581	sArchive.pBlob = &zip;
582	if( g.argc<3 ){
583	usage("ARCHIVE FILE....");
584	}
585	if( find_option("dereference","h",0)!=0 ){
586	eFType = ExtFILE;
587	}
588	zip_open();
589	for(i=3; i<g.argc; i++){
590	blob_zero(&file);
591	blob_read_from_file(&file, g.argv[i], eFType);
592	zip_add_file(&sArchive, g.argv[i], &file, file_perm(0,eFType));
593	blob_reset(&file);
594	}
595	zip_close(&sArchive);
596	blob_write_to_file(&zip, g.argv[2]);










































































597	}
598
599	/*
600	** Given the RID for a manifest, construct a ZIP archive containing
601	** all files in the corresponding baseline.
	@@ -927,10 +1015,13 @@
927	login_check_credentials();
928	if( !g.perm.Zip ){ login_needed(g.anon.Zip); return; }
929	if( fossil_strcmp(g.zPath, "sqlar")==0 ){
930	eType = ARCHIVE_SQLAR;
931	zType = "SQL";



932	}else{
933	eType = ARCHIVE_ZIP;
934	zType = "ZIP";
935	}
936	fossil_nice_default();
937
938	DDED test/link-tester.html
939	DDED test/link-tester.js
940	DDED test/link-tester.json

	--- src/zip.c
	+++ src/zip.c
	@@ -562,40 +562,128 @@
562	fossil_free(azDir);
563	nDir = 0;
564	azDir = 0;
565	}
566
567	/* Functions found in shell.c */
568	extern int sqlite3_fileio_init(sqlite3,char,const sqlite3_api_routines);
569	extern int sqlite3_zipfile_init(sqlite3,char,const sqlite3_api_routines);
570
571	/*
572	** COMMAND: test-filezip
573	**
574	** Usage: %fossil test-filezip [OPTIONS] ZIPFILE [FILENAME...]
575	**
576	** This command uses Fossil infrastructure or read or create a ZIP
577	** archive named by the ZIPFILE argument. With no options, a new
578	** ZIP archive is created and there must be at least one FILENAME
579	** argument. If the -l option is used, the contents of the named ZIP
580	** archive are listed on standard output. With the -x argument, the
581	** contents of the ZIP archive are extracted.
582	**
583	** There are two purposes for this command: (1) To server as a test
584	** platform for the Fossil ZIP archive generator, and (2) to provide
585	** rudimentary ZIP archive creation capabilities on platforms that do
586	** not have the "zip" command installed.
587	**
588	** Options:
589	**
590	** -h\|--dereference Follow symlinks
591	** -l\|--list List the contents of the ZIP archive
592	** -x\|--extract Extract files from a ZIP archive
593	*/
594	void filezip_cmd(void){



595	int eFType = SymFILE;
596	int doList = 0;
597	int doExtract = 0;
598	char *zArchiveName;




599	if( find_option("dereference","h",0)!=0 ){
600	eFType = ExtFILE;
601	}
602	if( find_option("list","l",0)!=0 ){
603	doList = 1;
604	}
605	if( find_option("extract","x",0)!=0 ){
606	if( doList ){
607	fossil_fatal("incompatible options: -l and -x");
608	}
609	doExtract = 1;
610	}
611	if( g.argc<3 ){
612	usage("ARCHIVE FILES...");
613	}
614	zArchiveName = g.argv[2];
615	sqlite3_open(":memory:", &g.db);
616	if( doList ){
617	/* Do a content listing of a ZIP archive */
618	Stmt q;
619	int nRow = 0;
620	i64 szTotal = 0;
621	if( file_size(zArchiveName, eFType)<0 ){
622	fossil_fatal("No such ZIP archive: %s", zArchiveName);
623	}
624	if( g.argc>3 ){
625	fossil_fatal("extra arguments after \"fossil test-filezip -l ARCHIVE\"");
626	}
627	sqlite3_zipfile_init(g.db, 0, 0);
628	db_multi_exec("CREATE VIRTUAL TABLE z1 USING zipfile(%Q)", zArchiveName);
629	db_prepare(&q, "SELECT sz, datetime(mtime,'unixepoch'), name FROM z1");
630	while( db_step(&q)==SQLITE_ROW ){
631	int sz = db_column_int(&q, 0);
632	szTotal += sz;
633	if( nRow==0 ){
634	fossil_print(" Length Date Time Name\n");
635	fossil_print("--------- ---------- ----- ----\n");
636	}
637	nRow++;
638	fossil_print("%9d %.16s %s\n", sz, db_column_text(&q,1),
639	db_column_text(&q,2));
640	}
641	if( nRow ){
642	fossil_print("--------- --------\n");
643	fossil_print("%9lld %16s %d files\n", szTotal, "", nRow);
644	}
645	db_finalize(&q);
646	}else if( doExtract ){
647	/* Extract files from an existing ZIP archive */
648	if( file_size(zArchiveName, eFType)<0 ){
649	fossil_fatal("No such ZIP archive: %s", zArchiveName);
650	}
651	if( g.argc>3 ){
652	fossil_fatal("extra arguments after \"fossil test-filezip -x ARCHIVE\"");
653	}
654	sqlite3_zipfile_init(g.db, 0, 0);
655	sqlite3_fileio_init(g.db, 0, 0);
656	db_multi_exec("CREATE VIRTUAL TABLE z1 USING zipfile(%Q)", zArchiveName);
657	db_multi_exec("SELECT writefile(name,data) FROM z1");
658	}else{
659	/* Without the -x or -l options, construct a new ZIP archive */
660	int i;
661	Blob zip;
662	Blob file;
663	Archive sArchive;
664	memset(&sArchive, 0, sizeof(Archive));
665	sArchive.eType = ARCHIVE_ZIP;
666	sArchive.pBlob = &zip;
667	if( file_size(zArchiveName, eFType)>0 ){
668	fossil_fatal("ZIP archive %s already exists", zArchiveName);
669	}
670	zip_open();
671	for(i=3; i<g.argc; i++){
672	double rDate;
673	i64 iDate;
674	blob_zero(&file);
675	blob_read_from_file(&file, g.argv[i], eFType);
676	iDate = file_mtime(g.argv[i], eFType);
677	rDate = ((double)iDate)/86400.0 + 2440587.5;
678	zip_set_timedate(rDate);
679	zip_add_file(&sArchive, g.argv[i], &file, file_perm(0,eFType));
680	blob_reset(&file);
681	}
682	zip_close(&sArchive);
683	blob_write_to_file(&zip, g.argv[2]);
684	}
685	}
686
687	/*
688	** Given the RID for a manifest, construct a ZIP archive containing
689	** all files in the corresponding baseline.
	@@ -927,10 +1015,13 @@
1015	login_check_credentials();
1016	if( !g.perm.Zip ){ login_needed(g.anon.Zip); return; }
1017	if( fossil_strcmp(g.zPath, "sqlar")==0 ){
1018	eType = ARCHIVE_SQLAR;
1019	zType = "SQL";
1020	/* For some reason, SQL-archives are like catnip for robots. So
1021	** don't allow them to be downloaded by user "nobody" */
1022	if( g.zLogin==0 ){ login_needed(g.anon.Zip); return; }
1023	}else{
1024	eType = ARCHIVE_ZIP;
1025	zType = "ZIP";
1026	}
1027	fossil_nice_default();
1028
1029	DDED test/link-tester.html
1030	DDED test/link-tester.js
1031	DDED test/link-tester.json

M test/link-tester.html

+82

		--- a/test/link-tester.html
		+++ b/test/link-tester.html
		@@ -0,0 +1,82 @@
	1	+<!DOCTYPE html>
	2	+<head><!--
	3	+ This file is intended to be loaded from a fossil
	4	+ repository, either using:
	5	+
	6	+ fossil ui --extpage test/link-tester.html
	7	+
	8	+ or by adding test/link-tester.* to uv and then:
	9	+
	10	+ fossil ui -page uv/link-tester.html
	11	+--></head>
	12	+<style>
	13	+ body {
	14	+ width: 100%;
	15	+ height: 100%;
	16	+ margin: 0;
	17	+ padding: 0;
	18	+ display: flex;
	19	+ flex-direction: column;
	20	+ }
	21	+ header {
	22	+ margin: 0.5em 0 0 0;
	23	+ padding: 0 1em 0 1em;
	24	+ z-index: 1;
	25	+ }
	26	+ #controlWrapper {
	27	+ display: flex;
	28	+ flex-direction: row;
	29	+ border-bottom: 2px dotted;
	30	+ padding-bottom: 0.5em;
	31	+ }
	32	+ #controlWrapper > button {
	33	+ flex-grow: 1;
	34	+ margin: 0.5em;
	35	+ }
	36	+ #selectWrapper {
	37	+ display: flex;
	38	+ flex-direction: column;
	39	+ flex-grow: 8;
	40	+ }
	41	+ #selectPage {
	42	+ flex-grow: 1;
	43	+ margin: 1em;
	44	+ padding: 1em;
	45	+ }
	46	+ #currentUrl {
	47	+ font-family: monospace;
	48	+ text-align: center;
	49	+ }
	50	+ #iframe {
	51	+ flex-grow: 1; border: none; margin: 0; padding: 0;
	52	+ display: block;
	53	+ /* Absolute positioning is apparently the only way to get
	54	+ the iframe to stretch to fill the page, but we have to
	55	+ set its Y coordinate to something a bit below #controls. */
	56	+ width: 100%;
	57	+ height: calc(100% - 5em);
	58	+ position: absolute;
	59	+ top: 4em;
	60	+ }
	61	+</style>
	62	+<body>
	63	+ <header>
	64	+ Fossil link test app. Select links from the list below to load
	65	+ them. Use the arrow keys to cycle through the list. The links are
	66	+ loaded within an iframe, so navigation within it will stay within
	67	+ that frame.
	68	+ </header>
	69	+ <header id='controlWrapper'>
	70	+ <button id='btn-prev'>←</button>
	71	+ <div id='selectWrapper'>
	72	+ <select id='selectPage'>
	73	+ <option>/timeline</option>
	74	+ <option>/dir</option>
	75	+ </select>
	76	+ <a target='_blank' id='currentUrl'></a>
	77	+ </div>
	78	+ <button id='btn-next'>→</button>
	79	+ </header>
	80	+ <iframe id='iframe'><!--populated via the UI--></iframe>
	81	+ <script src='link-tester.js'></script>
	82	+<body>

	--- a/test/link-tester.html
	+++ b/test/link-tester.html
	@@ -0,0 +1,82 @@

	--- a/test/link-tester.html
	+++ b/test/link-tester.html
	@@ -0,0 +1,82 @@
1	<!DOCTYPE html>
2	<head><!--
3	This file is intended to be loaded from a fossil
4	repository, either using:
5
6	fossil ui --extpage test/link-tester.html
7
8	or by adding test/link-tester.* to uv and then:
9
10	fossil ui -page uv/link-tester.html
11	--></head>
12	<style>
13	body {
14	width: 100%;
15	height: 100%;
16	margin: 0;
17	padding: 0;
18	display: flex;
19	flex-direction: column;
20	}
21	header {
22	margin: 0.5em 0 0 0;
23	padding: 0 1em 0 1em;
24	z-index: 1;
25	}
26	#controlWrapper {
27	display: flex;
28	flex-direction: row;
29	border-bottom: 2px dotted;
30	padding-bottom: 0.5em;
31	}
32	#controlWrapper > button {
33	flex-grow: 1;
34	margin: 0.5em;
35	}
36	#selectWrapper {
37	display: flex;
38	flex-direction: column;
39	flex-grow: 8;
40	}
41	#selectPage {
42	flex-grow: 1;
43	margin: 1em;
44	padding: 1em;
45	}
46	#currentUrl {
47	font-family: monospace;
48	text-align: center;
49	}
50	#iframe {
51	flex-grow: 1; border: none; margin: 0; padding: 0;
52	display: block;
53	/* Absolute positioning is apparently the only way to get
54	the iframe to stretch to fill the page, but we have to
55	set its Y coordinate to something a bit below #controls. */
56	width: 100%;
57	height: calc(100% - 5em);
58	position: absolute;
59	top: 4em;
60	}
61	</style>
62	<body>
63	<header>
64	Fossil link test app. Select links from the list below to load
65	them. Use the arrow keys to cycle through the list. The links are
66	loaded within an iframe, so navigation within it will stay within
67	that frame.
68	</header>
69	<header id='controlWrapper'>
70	<button id='btn-prev'>←</button>
71	<div id='selectWrapper'>
72	<select id='selectPage'>
73	<option>/timeline</option>
74	<option>/dir</option>
75	</select>
76	<a target='_blank' id='currentUrl'></a>
77	</div>
78	<button id='btn-next'>→</button>
79	</header>
80	<iframe id='iframe'><!--populated via the UI--></iframe>
81	<script src='link-tester.js'></script>
82	<body>

M test/link-tester.js

+224

		--- a/test/link-tester.js
		+++ b/test/link-tester.js
		@@ -0,0 +1,224 @@
	1	+/**
	2	+ JS code for link-tester.html. We cannot host this JS inline in that
	3	+ file because fossil's default Content Security Policy won't let it
	4	+ run that way.
	5	+*/
	6	+window.addEventListener("DOMContentLoaded", function(){
	7	+ const E = function(s){
	8	+ const e = document.querySelector(s);
	9	+ if( !e ) throw new Error("Missing element: "+s);
	10	+ return e;
	11	+ };
	12	+ const EAll = function(s){
	13	+ const e = document.querySelectorAll(s);
	14	+ if( !e \|\| !e.length ) throw new Error("Missing elements: "+s);
	15	+ return e;
	16	+ };
	17	+ const eIframe = E('#iframe');
	18	+ const eSelect = E('#selectPage');
	19	+ const eCurrentUrl = E('#currentUrl');
	20	+
	21	+ /*
	22	+ Prepend the fossil instance's URL to each link. We have to guess
	23	+ which part of the URL is the fossil CGI/server instance. The
	24	+ following works when run (A) from under /uv or /ext and (B) from
	25	+ /doc/branchname/test/link-tester.html.
	26	+ */
	27	+ let urlTop;
	28	+ let loc = (''+window.location);
	29	+ let aLoc = loc.split('/')
	30	+ aLoc.pop(); /* file name */
	31	+ const thisDir = aLoc.join('/');
	32	+ const rxDoc = /.\/doc\/[^/]+\/./;
	33	+ //console.log(rxDoc, loc, aLoc);
	34	+ if( loc.match(rxDoc) ){
	35	+ /* We're hopefully now at the top-most fossil-served
	36	+ URL. */
	37	+ aLoc.pop(); aLoc.pop(); /* /doc/foo */
	38	+ aLoc.pop(); /* current dir name */
	39	+ }else{
	40	+ aLoc.pop(); /* current dir name */
	41	+ }
	42	+ urlTop = aLoc.join('/');
	43	+ //console.log(urlTop, aLoc);
	44	+ for( const o of eSelect.options ){
	45	+ o.value = urlTop + (o.value \|\| o.innerText);
	46	+ }
	47	+
	48	+ const updateUrl = function(opt){
	49	+ if( opt ){
	50	+ let url = (opt.value \|\| opt.innerText);
	51	+ eCurrentUrl.innerText = url.replace(urlTop,'');
	52	+ eCurrentUrl.setAttribute('href', url);
	53	+ }else{
	54	+ eCurrentUrl.innerText = '';
	55	+ }
	56	+ };
	57	+
	58	+ eSelect.addEventListener('change',function(ev){
	59	+ const so = ev.target.options[ev.target.selectedIndex];
	60	+ if( so ){
	61	+ eIframe.setAttribute('src', so.value \|\| so.innerText);
	62	+ updateUrl(so);
	63	+ }
	64	+ });
	65	+
	66	+ /** Select the entry at the given ndx and fire a change event. */
	67	+ const selectEntry = function(ndx){
	68	+ if( ndx>=0 ){
	69	+ eSelect.selectedIndex = ndx;
	70	+ eSelect.dispatchEvent(new Event('change',{target:eSelect}));
	71	+ }
	72	+ };
	73	+
	74	+ /* Cycle to the next link in the list, accounting for separators and
	75	+ wrapping around at either end. */
	76	+ const cycleLink = function(dir/<0 = prev, >0 = next/){
	77	+ let n = eSelect.selectedIndex + dir;
	78	+ if( n < 0 ) n = eSelect.options.length-1;
	79	+ else if( n>=eSelect.options.length ){
	80	+ n = 0;
	81	+ }
	82	+ const opt = eSelect.options[n];
	83	+ if( opt && opt.disabled ){
	84	+ /* If that OPTION element is disabled, skip over it. */
	85	+ eSelect.selectedIndex = n;
	86	+ cycleLink(dir);
	87	+ }else{
	88	+ selectEntry(n);
	89	+ }
	90	+ };
	91	+
	92	+ E('#btn-prev').addEventListener('click', ()=>cycleLink(-1), false);
	93	+ E('#btn-next').addEventListener('click', ()=>cycleLink(1), false);
	94	+
	95	+ /**
	96	+ We have to adjust the iframe's size dynamically to account for
	97	+ other widgets around it. iframes don't simply like to fill up all
	98	+ available space without some help. If #controlWrapper only
	99	+ contained the one SELECT element, CSS would be sufficient, but
	100	+ once we add text around it, #controlWrapper's size becomes
	101	+ unpredictable and we need JS to calculate it. We do this every
	102	+ time the window size changes.
	103	+ */
	104	+ const effectiveHeight = function f(e){
	105	+ // Copied from fossil.dom.js
	106	+ if(!e) return 0;
	107	+ if(!f.measure){
	108	+ f.measure = function callee(e, depth){
	109	+ if(!e) return;
	110	+ const m = e.getBoundingClientRect();
	111	+ if(0===depth){
	112	+ callee.top = m.top;
	113	+ callee.bottom = m.bottom;
	114	+ }else{
	115	+ callee.top = m.top ? Math.min(callee.top, m.top) : callee.top;
	116	+ callee.bottom = Math.max(callee.bottom, m.bottom);
	117	+ }
	118	+ Array.prototype.forEach.call(e.children,(e)=>callee(e,depth+1));
	119	+ if(0===depth){
	120	+ //console.debug("measure() height:",e.className, callee.top, callee.bottom, (callee.bottom - callee.top));
	121	+ f.extra += callee.bottom - callee.top;
	122	+ }
	123	+ return f.extra;
	124	+ };
	125	+ }
	126	+ f.extra = 0;
	127	+ f.measure(e,0);
	128	+ return f.extra;
	129	+ };
	130	+
	131	+ /* Helper for the window-resized event handler below, to avoid
	132	+ handling the resize until after it's finished. */
	133	+ const debounce = function f(func, waitMs, immediate) {
	134	+ // Copied from fossil.bootstrap.js
	135	+ var timeoutId;
	136	+ if(!waitMs) waitMs = f.$defaultDelay;
	137	+ return function() {
	138	+ const context = this, args = Array.prototype.slice.call(arguments);
	139	+ const later = function() {
	140	+ timeoutId = undefined;
	141	+ if(!immediate) func.apply(context, args);
	142	+ };
	143	+ const callNow = immediate && !timeoutId;
	144	+ clearTimeout(timeoutId);
	145	+ timeoutId = setTimeout(later, waitMs);
	146	+ if(callNow) func.apply(context, args);
	147	+ };
	148	+ };
	149	+
	150	+ /**
	151	+ Resize eConstrained (the ifame element) so that it fits within
	152	+ the page space not occupied by the list of elements eToAvoid.
	153	+ */
	154	+ const ForceResizeKludge = (function(eToAvoid, eConstrained){
	155	+ const resized = function f(){
	156	+ if( f.$disabled ) return;
	157	+ const wh = window.innerHeight;
	158	+ let ht;
	159	+ let extra = 0;
	160	+ eToAvoid.forEach((e)=>e ? extra += effectiveHeight(e) : false);
	161	+ ht = wh - extra;
	162	+ if( ht < 100 ) ht = 100;
	163	+ eConstrained.style.top = 'calc('+extra+'px + 2em)';
	164	+ eConstrained.style.height =
	165	+ eConstrained.style.maxHeight = "calc("+ ht+ "px - 2em)";
	166	+ };
	167	+ resized.$disabled = true/* gets deleted later */;
	168	+ window.addEventListener('resize', debounce(resized, 250), false);
	169	+ return resized;
	170	+ })(
	171	+ EAll('body > *:not(iframe)'),
	172	+ eIframe
	173	+ );
	174	+
	175	+ delete ForceResizeKludge.$disabled;
	176	+ ForceResizeKludge();
	177	+
	178	+ selectEntry(0);
	179	+
	180	+ /**
	181	+ Read link-tester.json, which should live in the same directory
	182	+ as this file. It's expected to be an array with entries
	183	+ in one of the following forms:
	184	+
	185	+ - "string" = Separator label (disabled)
	186	+ - ["/path"] = path with itself as a label
	187	+ - ["label", "/path"] = path with the given label
	188	+
	189	+ All paths are expected to have a "/" prefix and this script
	190	+ accounts for mapping that to the fossil part of this script's
	191	+ URL.
	192	+ */
	193	+ window.fetch(thisDir+'/link-tester.json').then((r)=>r.json()).then(j=>{
	194	+ //console.log("fetched",j);
	195	+ eSelect.innerHTML = '';
	196	+ const opt = function(arg){
	197	+ const o = document.createElement('option');
	198	+ //console.warn(arguments);
	199	+ let rc = true;
	200	+ if( 'string' === typeof arg ){
	201	+ /* Grouping separator */
	202	+ o.innerText = "--- " + arg + " ---";
	203	+ o.setAttribute('disabled','');
	204	+ rc = false;
	205	+ }else if( 1===arg.length ){
	206	+ o.innerText = arg[0];
	207	+ o.value = urlTop + arg[0];
	208	+ }else if( 2==arg.length ){
	209	+ o.innerText = arg[0];
	210	+ o.value = urlTop + arg[1];
	211	+ }
	212	+ eSelect.appendChild(o);
	213	+ return rc;
	214	+ };
	215	+ let ndx = -1/index of first non-disabled entry/, i = 0;
	216	+ for(const e of j){
	217	+ if( opt(e) && ndx<0 ){
	218	+ ndx = i;
	219	+ }
	220	+ ++i;
	221	+ }
	222	+ selectEntry(ndx);
	223	+ });
	224	+});

	--- a/test/link-tester.js
	+++ b/test/link-tester.js
	@@ -0,0 +1,224 @@

	--- a/test/link-tester.js
	+++ b/test/link-tester.js
	@@ -0,0 +1,224 @@
1	/**
2	JS code for link-tester.html. We cannot host this JS inline in that
3	file because fossil's default Content Security Policy won't let it
4	run that way.
5	*/
6	window.addEventListener("DOMContentLoaded", function(){
7	const E = function(s){
8	const e = document.querySelector(s);
9	if( !e ) throw new Error("Missing element: "+s);
10	return e;
11	};
12	const EAll = function(s){
13	const e = document.querySelectorAll(s);
14	if( !e \|\| !e.length ) throw new Error("Missing elements: "+s);
15	return e;
16	};
17	const eIframe = E('#iframe');
18	const eSelect = E('#selectPage');
19	const eCurrentUrl = E('#currentUrl');
20
21	/*
22	Prepend the fossil instance's URL to each link. We have to guess
23	which part of the URL is the fossil CGI/server instance. The
24	following works when run (A) from under /uv or /ext and (B) from
25	/doc/branchname/test/link-tester.html.
26	*/
27	let urlTop;
28	let loc = (''+window.location);
29	let aLoc = loc.split('/')
30	aLoc.pop(); /* file name */
31	const thisDir = aLoc.join('/');
32	const rxDoc = /.\/doc\/[^/]+\/./;
33	//console.log(rxDoc, loc, aLoc);
34	if( loc.match(rxDoc) ){
35	/* We're hopefully now at the top-most fossil-served
36	URL. */
37	aLoc.pop(); aLoc.pop(); /* /doc/foo */
38	aLoc.pop(); /* current dir name */
39	}else{
40	aLoc.pop(); /* current dir name */
41	}
42	urlTop = aLoc.join('/');
43	//console.log(urlTop, aLoc);
44	for( const o of eSelect.options ){
45	o.value = urlTop + (o.value \|\| o.innerText);
46	}
47
48	const updateUrl = function(opt){
49	if( opt ){
50	let url = (opt.value \|\| opt.innerText);
51	eCurrentUrl.innerText = url.replace(urlTop,'');
52	eCurrentUrl.setAttribute('href', url);
53	}else{
54	eCurrentUrl.innerText = '';
55	}
56	};
57
58	eSelect.addEventListener('change',function(ev){
59	const so = ev.target.options[ev.target.selectedIndex];
60	if( so ){
61	eIframe.setAttribute('src', so.value \|\| so.innerText);
62	updateUrl(so);
63	}
64	});
65
66	/** Select the entry at the given ndx and fire a change event. */
67	const selectEntry = function(ndx){
68	if( ndx>=0 ){
69	eSelect.selectedIndex = ndx;
70	eSelect.dispatchEvent(new Event('change',{target:eSelect}));
71	}
72	};
73
74	/* Cycle to the next link in the list, accounting for separators and
75	wrapping around at either end. */
76	const cycleLink = function(dir/<0 = prev, >0 = next/){
77	let n = eSelect.selectedIndex + dir;
78	if( n < 0 ) n = eSelect.options.length-1;
79	else if( n>=eSelect.options.length ){
80	n = 0;
81	}
82	const opt = eSelect.options[n];
83	if( opt && opt.disabled ){
84	/* If that OPTION element is disabled, skip over it. */
85	eSelect.selectedIndex = n;
86	cycleLink(dir);
87	}else{
88	selectEntry(n);
89	}
90	};
91
92	E('#btn-prev').addEventListener('click', ()=>cycleLink(-1), false);
93	E('#btn-next').addEventListener('click', ()=>cycleLink(1), false);
94
95	/**
96	We have to adjust the iframe's size dynamically to account for
97	other widgets around it. iframes don't simply like to fill up all
98	available space without some help. If #controlWrapper only
99	contained the one SELECT element, CSS would be sufficient, but
100	once we add text around it, #controlWrapper's size becomes
101	unpredictable and we need JS to calculate it. We do this every
102	time the window size changes.
103	*/
104	const effectiveHeight = function f(e){
105	// Copied from fossil.dom.js
106	if(!e) return 0;
107	if(!f.measure){
108	f.measure = function callee(e, depth){
109	if(!e) return;
110	const m = e.getBoundingClientRect();
111	if(0===depth){
112	callee.top = m.top;
113	callee.bottom = m.bottom;
114	}else{
115	callee.top = m.top ? Math.min(callee.top, m.top) : callee.top;
116	callee.bottom = Math.max(callee.bottom, m.bottom);
117	}
118	Array.prototype.forEach.call(e.children,(e)=>callee(e,depth+1));
119	if(0===depth){
120	//console.debug("measure() height:",e.className, callee.top, callee.bottom, (callee.bottom - callee.top));
121	f.extra += callee.bottom - callee.top;
122	}
123	return f.extra;
124	};
125	}
126	f.extra = 0;
127	f.measure(e,0);
128	return f.extra;
129	};
130
131	/* Helper for the window-resized event handler below, to avoid
132	handling the resize until after it's finished. */
133	const debounce = function f(func, waitMs, immediate) {
134	// Copied from fossil.bootstrap.js
135	var timeoutId;
136	if(!waitMs) waitMs = f.$defaultDelay;
137	return function() {
138	const context = this, args = Array.prototype.slice.call(arguments);
139	const later = function() {
140	timeoutId = undefined;
141	if(!immediate) func.apply(context, args);
142	};
143	const callNow = immediate && !timeoutId;
144	clearTimeout(timeoutId);
145	timeoutId = setTimeout(later, waitMs);
146	if(callNow) func.apply(context, args);
147	};
148	};
149
150	/**
151	Resize eConstrained (the ifame element) so that it fits within
152	the page space not occupied by the list of elements eToAvoid.
153	*/
154	const ForceResizeKludge = (function(eToAvoid, eConstrained){
155	const resized = function f(){
156	if( f.$disabled ) return;
157	const wh = window.innerHeight;
158	let ht;
159	let extra = 0;
160	eToAvoid.forEach((e)=>e ? extra += effectiveHeight(e) : false);
161	ht = wh - extra;
162	if( ht < 100 ) ht = 100;
163	eConstrained.style.top = 'calc('+extra+'px + 2em)';
164	eConstrained.style.height =
165	eConstrained.style.maxHeight = "calc("+ ht+ "px - 2em)";
166	};
167	resized.$disabled = true/* gets deleted later */;
168	window.addEventListener('resize', debounce(resized, 250), false);
169	return resized;
170	})(
171	EAll('body > *:not(iframe)'),
172	eIframe
173	);
174
175	delete ForceResizeKludge.$disabled;
176	ForceResizeKludge();
177
178	selectEntry(0);
179
180	/**
181	Read link-tester.json, which should live in the same directory
182	as this file. It's expected to be an array with entries
183	in one of the following forms:
184
185	- "string" = Separator label (disabled)
186	- ["/path"] = path with itself as a label
187	- ["label", "/path"] = path with the given label
188
189	All paths are expected to have a "/" prefix and this script
190	accounts for mapping that to the fossil part of this script's
191	URL.
192	*/
193	window.fetch(thisDir+'/link-tester.json').then((r)=>r.json()).then(j=>{
194	//console.log("fetched",j);
195	eSelect.innerHTML = '';
196	const opt = function(arg){
197	const o = document.createElement('option');
198	//console.warn(arguments);
199	let rc = true;
200	if( 'string' === typeof arg ){
201	/* Grouping separator */
202	o.innerText = "--- " + arg + " ---";
203	o.setAttribute('disabled','');
204	rc = false;
205	}else if( 1===arg.length ){
206	o.innerText = arg[0];
207	o.value = urlTop + arg[0];
208	}else if( 2==arg.length ){
209	o.innerText = arg[0];
210	o.value = urlTop + arg[1];
211	}
212	eSelect.appendChild(o);
213	return rc;
214	};
215	let ndx = -1/index of first non-disabled entry/, i = 0;
216	for(const e of j){
217	if( opt(e) && ndx<0 ){
218	ndx = i;
219	}
220	++i;
221	}
222	selectEntry(ndx);
223	});
224	});

M test/link-tester.json

+68

		--- a/test/link-tester.json
		+++ b/test/link-tester.json
		@@ -0,0 +1,68 @@
	1	+[
	2	+ "Timelines",
	3	+ ["Default", "/timeline"],
	4	+ ["anonymous", "/timeline?u=anonymous&y=a"],
	5	+ ["after date/time", "/timeline?n=12&y=ci&a=2024-12-31T20:29Z"],
	6	+ ["after hash", "/timeline?n=12&y=ci&a=3cb092c0e2f0ff26"],
	7	+ ["before date/time", "/timeline?n=12&y=ci&b=2024-12-31T20:30Z"],
	8	+ ["before hash", "/timeline?n=12&y=ci&b=3cb092c0e2f0ff26"],
	9	+ ["circa date/time", "/timeline?n=12&y=ci&c=2024-12-31T20:29Z"],
	10	+ ["circa hash", "/timeline?n=12&y=ci&c=3cb092c0e2f0ff26"],
	11	+ ["d=,p=", "/timeline?d=version-2.25&p=version-2.26"],
	12	+ ["from=,ft=", "/timeline?from=2765f04694d36e68&ft=release"],
	13	+ ["from=,ft=,min", "/timeline?from=2765f04694d36e68&ft=release&min"],
	14	+ ["from=,to=", "/timeline?from=version-2.25&to=version-2.26"],
	15	+ ["from=,to=,min", "/timeline?from=version-2.25&to=version-2.26&min"],
	16	+ ["omit-cr branch", "/timeline?r=omit-cr&m&c=7e97f4999b16ab75"],
	17	+ ["diff-eolws branch", "/timeline?r=diff-eolws&n=50"],
	18	+ ["Shortest path (from=,to=)",
	19	+ "/timeline?from=e663bac6f7&to=a298a0e2f9&shortest"],
	20	+ ["Common Ancestor (me=,you=)",
	21	+ "/timeline?me=e663bac6f7&you=a298a0e2f9"],
	22	+
	23	+ "Diff",
	24	+ ["Multiple edits on a single line", "/info/030035345c#chunk73"],
	25	+ ["Tricky alignment, multiple edits per line",
	26	+ "/fdiff?v1=6da016415dc52d61&v2=af6df3466e3c4a88"],
	27	+ ["Column alignment with multibyte characters",
	28	+ "/fdiff?v1=d1c60722e0b9d775&v2=58d1a8991bacb113"],
	29	+ ["Large diff of sqlite3.c - was once very slow",
	30	+ "/fdiff?v1=57b0d8183cab0e3d&v2=37b3ef49d73cdfe6"],
	31	+ ["A difficult indentation change", "/info/bda00cbada#chunk49"],
	32	+ ["Inverse of the previous",
	33	+ "/fdiff?v1=bc8100c9ee01b8c2&v2=1d2acc1a2a65c2bf#chunk42"],
	34	+ ["Another tricky indentation",
	35	+ "/fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk13"],
	36	+ ["Inverse of the previous",
	37	+ "/fdiff?v2=955cc67ace8fb622&v1=e2e1c87b86664b45#chunk13"],
	38	+ ["A tricky alignment",
	39	+ "/fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk24"],
	40	+ ["sqlite3.c changes that are difficult to align",
	41	+ "/fdiff?v1=21f9a00fe2fa4a17&v2=d5c4ff0532bd89c3#chunk5"],
	42	+ ["Lorem Ipsum in Greek", "/fdiff?v1=4f70c682e44f&v2=55659c6e062994f"],
	43	+ ["Inverted Greek Lorem Ipsum", "/fdiff?v2=4f70c682e44f&v1=55659c6e062994f"],
	44	+
	45	+ "Infos",
	46	+ ["Merge riser coalescing #1", "/info/eed3946bd92a499?diff=0"],
	47	+ ["Merge riser coalescing #2", "/info/ef6979eac9abded?diff=0"],
	48	+ ["Merge riser coalescing #3", "/info/9e1fa626e47f147?diff=0"],
	49	+ ["Merge riser coalescing #4", "/info/68bd2e7bedb8d05?diff=0"],
	50	+ ["Merge riser coalescing #5", "/info/7766e689926c703?diff=0"],
	51	+ ["Merge riser coalescing #6", "/info/3ea66260b5555d2?diff=0"],
	52	+ ["Merge riser coalescing #7", "/info/66ae70a54b20656?diff=0"],
	53	+ ["Context graph #1", "/info/b0f2a0ac53926c9?diff=0"],
	54	+ ["Context graph #2", "/info/303e7af7c31866c?diff=0"],
	55	+ ["Context graph #3", "/info/b31afcc2cab1dc4?diff=0"],
	56	+ ["Context graph #4", "/info/1a164e5fb76a46b?diff=0"],
	57	+ ["Context graph #5", "/info/2d75e87b760c0a9?diff=0"],
	58	+ ["Context graph #6", "/info/76442af7e13267bd?diff=0"],
	59	+ ["Info about the tip", "/info/tip"],
	60	+ ["/info/tip"],
	61	+
	62	+ "Admin",
	63	+ ["Users", "/setup_ulist"],
	64	+
	65	+ "Misc.",
	66	+ ["/skins"],
	67	+ ["/chat"]
	68	+]

	--- a/test/link-tester.json
	+++ b/test/link-tester.json
	@@ -0,0 +1,68 @@

	--- a/test/link-tester.json
	+++ b/test/link-tester.json
	@@ -0,0 +1,68 @@
1	[
2	"Timelines",
3	["Default", "/timeline"],
4	["anonymous", "/timeline?u=anonymous&y=a"],
5	["after date/time", "/timeline?n=12&y=ci&a=2024-12-31T20:29Z"],
6	["after hash", "/timeline?n=12&y=ci&a=3cb092c0e2f0ff26"],
7	["before date/time", "/timeline?n=12&y=ci&b=2024-12-31T20:30Z"],
8	["before hash", "/timeline?n=12&y=ci&b=3cb092c0e2f0ff26"],
9	["circa date/time", "/timeline?n=12&y=ci&c=2024-12-31T20:29Z"],
10	["circa hash", "/timeline?n=12&y=ci&c=3cb092c0e2f0ff26"],
11	["d=,p=", "/timeline?d=version-2.25&p=version-2.26"],
12	["from=,ft=", "/timeline?from=2765f04694d36e68&ft=release"],
13	["from=,ft=,min", "/timeline?from=2765f04694d36e68&ft=release&min"],
14	["from=,to=", "/timeline?from=version-2.25&to=version-2.26"],
15	["from=,to=,min", "/timeline?from=version-2.25&to=version-2.26&min"],
16	["omit-cr branch", "/timeline?r=omit-cr&m&c=7e97f4999b16ab75"],
17	["diff-eolws branch", "/timeline?r=diff-eolws&n=50"],
18	["Shortest path (from=,to=)",
19	"/timeline?from=e663bac6f7&to=a298a0e2f9&shortest"],
20	["Common Ancestor (me=,you=)",
21	"/timeline?me=e663bac6f7&you=a298a0e2f9"],
22
23	"Diff",
24	["Multiple edits on a single line", "/info/030035345c#chunk73"],
25	["Tricky alignment, multiple edits per line",
26	"/fdiff?v1=6da016415dc52d61&v2=af6df3466e3c4a88"],
27	["Column alignment with multibyte characters",
28	"/fdiff?v1=d1c60722e0b9d775&v2=58d1a8991bacb113"],
29	["Large diff of sqlite3.c - was once very slow",
30	"/fdiff?v1=57b0d8183cab0e3d&v2=37b3ef49d73cdfe6"],
31	["A difficult indentation change", "/info/bda00cbada#chunk49"],
32	["Inverse of the previous",
33	"/fdiff?v1=bc8100c9ee01b8c2&v2=1d2acc1a2a65c2bf#chunk42"],
34	["Another tricky indentation",
35	"/fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk13"],
36	["Inverse of the previous",
37	"/fdiff?v2=955cc67ace8fb622&v1=e2e1c87b86664b45#chunk13"],
38	["A tricky alignment",
39	"/fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk24"],
40	["sqlite3.c changes that are difficult to align",
41	"/fdiff?v1=21f9a00fe2fa4a17&v2=d5c4ff0532bd89c3#chunk5"],
42	["Lorem Ipsum in Greek", "/fdiff?v1=4f70c682e44f&v2=55659c6e062994f"],
43	["Inverted Greek Lorem Ipsum", "/fdiff?v2=4f70c682e44f&v1=55659c6e062994f"],
44
45	"Infos",
46	["Merge riser coalescing #1", "/info/eed3946bd92a499?diff=0"],
47	["Merge riser coalescing #2", "/info/ef6979eac9abded?diff=0"],
48	["Merge riser coalescing #3", "/info/9e1fa626e47f147?diff=0"],
49	["Merge riser coalescing #4", "/info/68bd2e7bedb8d05?diff=0"],
50	["Merge riser coalescing #5", "/info/7766e689926c703?diff=0"],
51	["Merge riser coalescing #6", "/info/3ea66260b5555d2?diff=0"],
52	["Merge riser coalescing #7", "/info/66ae70a54b20656?diff=0"],
53	["Context graph #1", "/info/b0f2a0ac53926c9?diff=0"],
54	["Context graph #2", "/info/303e7af7c31866c?diff=0"],
55	["Context graph #3", "/info/b31afcc2cab1dc4?diff=0"],
56	["Context graph #4", "/info/1a164e5fb76a46b?diff=0"],
57	["Context graph #5", "/info/2d75e87b760c0a9?diff=0"],
58	["Context graph #6", "/info/76442af7e13267bd?diff=0"],
59	["Info about the tip", "/info/tip"],
60	["/info/tip"],
61
62	"Admin",
63	["Users", "/setup_ulist"],
64
65	"Misc.",
66	["/skins"],
67	["/chat"]
68	]

M tools/makemake.tcl

+13 -7

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -245,10 +245,11 @@
245	245	-DSQLITE_ENABLE_DBSTAT_VTAB
246	246	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
247	247	-DSQLITE_ENABLE_FTS4
248	248	-DSQLITE_ENABLE_FTS5
249	249	-DSQLITE_ENABLE_MATH_FUNCTIONS
	250	+ -DSQLITE_ENABLE_SETLK_TIMEOUT
250	251	-DSQLITE_ENABLE_STMTVTAB
251	252	-DSQLITE_HAVE_ZLIB
252	253	-DSQLITE_ENABLE_DBPAGE_VTAB
253	254	-DSQLITE_TRUSTED_SCHEMA=0
254	255	-DHAVE_USLEEP
		@@ -368,39 +369,41 @@
368	369	writeln [string map [list \
369	370	<<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
370	371	<<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
371	372	<<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
372	373	<<<NEXT_LINE>>> \\] {
373		-all: $(OBJDIR) $(APPNAME)
	374	+all: $(APPNAME)
374	375
375	376	install: all
376	377	mkdir -p $(INSTALLDIR)
377	378	cp $(APPNAME) $(INSTALLDIR)
378	379
379	380	codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
380	381	$(OBJDIR)/codecheck1 $(TRANS_SRC)
381	382
382		-$(OBJDIR):
383		- -mkdir $(OBJDIR)
384		-
385	383	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
386	384	-mkdir -p $(OBJDIR)
387	385	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
388	386
389	387	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
	388	+ -mkdir -p $(OBJDIR)
390	389	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
391	390
392	391	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
	392	+ -mkdir -p $(OBJDIR)
393	393	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
394	394
395	395	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
	396	+ -mkdir -p $(OBJDIR)
396	397	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
397	398
398	399	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
	400	+ -mkdir -p $(OBJDIR)
399	401	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
400	402
401	403	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
	404	+ -mkdir -p $(OBJDIR)
402	405	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
403	406
404	407	# Run the test suite.
405	408	# Other flags that can be included in TESTFLAGS are:
406	409	#
		@@ -412,11 +415,11 @@
412	415	# -strict Treat known bugs as failures
413	416	#
414	417	# TESTFLAGS can also include names of specific test files to limit
415	418	# the run to just those test cases.
416	419	#
417		-test: $(OBJDIR) $(APPNAME)
	420	+test: $(APPNAME)
418	421	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
419	422
420	423	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
421	424	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
422	425	$(SRCDIR)/../manifest <<<NEXT_LINE>>>
		@@ -552,23 +555,26 @@
552	555
553	556	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
554	557	writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
555	558
556	559	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
	560	+writeln "\t-mkdir -p \$(OBJDIR)\n"
557	561	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
558	562
559	563	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	564	+writeln "\t-mkdir -p \$(OBJDIR)\n"
560	565	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
561	566
562	567	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
	568	+writeln "\t-mkdir -p \$(OBJDIR)\n"
563	569	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
564	570
565	571	writeln [string map [list <<<NEXT_LINE>>> \\] {
566		-$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
	572	+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
567	573	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568	574
569		-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
	575	+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
570	576	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571	577
572	578	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
573	579	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574	580	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
575	581

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -245,10 +245,11 @@
245	-DSQLITE_ENABLE_DBSTAT_VTAB
246	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
247	-DSQLITE_ENABLE_FTS4
248	-DSQLITE_ENABLE_FTS5
249	-DSQLITE_ENABLE_MATH_FUNCTIONS

250	-DSQLITE_ENABLE_STMTVTAB
251	-DSQLITE_HAVE_ZLIB
252	-DSQLITE_ENABLE_DBPAGE_VTAB
253	-DSQLITE_TRUSTED_SCHEMA=0
254	-DHAVE_USLEEP
	@@ -368,39 +369,41 @@
368	writeln [string map [list \
369	<<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
370	<<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
371	<<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
372	<<<NEXT_LINE>>> \\] {
373	all: $(OBJDIR) $(APPNAME)
374
375	install: all
376	mkdir -p $(INSTALLDIR)
377	cp $(APPNAME) $(INSTALLDIR)
378
379	codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
380	$(OBJDIR)/codecheck1 $(TRANS_SRC)
381
382	$(OBJDIR):
383	-mkdir $(OBJDIR)
384
385	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
386	-mkdir -p $(OBJDIR)
387	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
388
389	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c

390	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
391
392	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c

393	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
394
395	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c

396	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
397
398	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c

399	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
400
401	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c

402	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
403
404	# Run the test suite.
405	# Other flags that can be included in TESTFLAGS are:
406	#
	@@ -412,11 +415,11 @@
412	# -strict Treat known bugs as failures
413	#
414	# TESTFLAGS can also include names of specific test files to limit
415	# the run to just those test cases.
416	#
417	test: $(OBJDIR) $(APPNAME)
418	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
419
420	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
421	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
422	$(SRCDIR)/../manifest <<<NEXT_LINE>>>
	@@ -552,23 +555,26 @@
552
553	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
554	writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
555
556	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"

557	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
558
559	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"

560	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
561
562	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"

563	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
564
565	writeln [string map [list <<<NEXT_LINE>>> \\] {
566	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
567	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568
569	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
570	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571
572	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
573	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
575

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -245,10 +245,11 @@
245	-DSQLITE_ENABLE_DBSTAT_VTAB
246	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
247	-DSQLITE_ENABLE_FTS4
248	-DSQLITE_ENABLE_FTS5
249	-DSQLITE_ENABLE_MATH_FUNCTIONS
250	-DSQLITE_ENABLE_SETLK_TIMEOUT
251	-DSQLITE_ENABLE_STMTVTAB
252	-DSQLITE_HAVE_ZLIB
253	-DSQLITE_ENABLE_DBPAGE_VTAB
254	-DSQLITE_TRUSTED_SCHEMA=0
255	-DHAVE_USLEEP
	@@ -368,39 +369,41 @@
369	writeln [string map [list \
370	<<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
371	<<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
372	<<<PIKCHR_OPTIONS>>> [join $PIKCHR_OPTIONS " \\\n "] \
373	<<<NEXT_LINE>>> \\] {
374	all: $(APPNAME)
375
376	install: all
377	mkdir -p $(INSTALLDIR)
378	cp $(APPNAME) $(INSTALLDIR)
379
380	codecheck: $(TRANS_SRC) $(OBJDIR)/codecheck1
381	$(OBJDIR)/codecheck1 $(TRANS_SRC)
382



383	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
384	-mkdir -p $(OBJDIR)
385	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
386
387	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
388	-mkdir -p $(OBJDIR)
389	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
390
391	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
392	-mkdir -p $(OBJDIR)
393	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
394
395	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
396	-mkdir -p $(OBJDIR)
397	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
398
399	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
400	-mkdir -p $(OBJDIR)
401	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
402
403	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
404	-mkdir -p $(OBJDIR)
405	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
406
407	# Run the test suite.
408	# Other flags that can be included in TESTFLAGS are:
409	#
	@@ -412,11 +415,11 @@
415	# -strict Treat known bugs as failures
416	#
417	# TESTFLAGS can also include names of specific test files to limit
418	# the run to just those test cases.
419	#
420	test: $(APPNAME)
421	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
422
423	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
424	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
425	$(SRCDIR)/../manifest <<<NEXT_LINE>>>
	@@ -552,23 +555,26 @@
555
556	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
557	writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
558
559	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
560	writeln "\t-mkdir -p \$(OBJDIR)\n"
561	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
562
563	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
564	writeln "\t-mkdir -p \$(OBJDIR)\n"
565	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
566
567	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
568	writeln "\t-mkdir -p \$(OBJDIR)\n"
569	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
570
571	writeln [string map [list <<<NEXT_LINE>>> \\] {
572	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c $(OBJDIR)/mkversion
573	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
574
575	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c $(OBJDIR)/mkversion
576	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
577
578	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
579	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
580	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
581

M win/Makefile.dmc

+2 -2

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -26,13 +26,13 @@
26	26	CFLAGS = -o
27	27	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
28	28	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
29	29	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30	30
31		-SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
	31	+SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
32	32
33		-SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
	33	+SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34	34
35	35	PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36	36
37	37	SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38	38
39	39

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -26,13 +26,13 @@
26	CFLAGS = -o
27	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
28	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
29	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30
31	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
32
33	SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34
35	PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37	SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38
39

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -26,13 +26,13 @@
26	CFLAGS = -o
27	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
28	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
29	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi
30
31	SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP
32
33	SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
34
35	PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37	SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38
39

M win/Makefile.mingw

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -2533,10 +2533,11 @@
2533	2533	-DSQLITE_ENABLE_DBSTAT_VTAB \
2534	2534	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2535	2535	-DSQLITE_ENABLE_FTS4 \
2536	2536	-DSQLITE_ENABLE_FTS5 \
2537	2537	-DSQLITE_ENABLE_MATH_FUNCTIONS \
	2538	+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
2538	2539	-DSQLITE_ENABLE_STMTVTAB \
2539	2540	-DSQLITE_HAVE_ZLIB \
2540	2541	-DSQLITE_ENABLE_DBPAGE_VTAB \
2541	2542	-DSQLITE_TRUSTED_SCHEMA=0 \
2542	2543	-DHAVE_USLEEP \
		@@ -2562,10 +2563,11 @@
2562	2563	-DSQLITE_ENABLE_DBSTAT_VTAB \
2563	2564	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2564	2565	-DSQLITE_ENABLE_FTS4 \
2565	2566	-DSQLITE_ENABLE_FTS5 \
2566	2567	-DSQLITE_ENABLE_MATH_FUNCTIONS \
	2568	+ -DSQLITE_ENABLE_SETLK_TIMEOUT \
2567	2569	-DSQLITE_ENABLE_STMTVTAB \
2568	2570	-DSQLITE_HAVE_ZLIB \
2569	2571	-DSQLITE_ENABLE_DBPAGE_VTAB \
2570	2572	-DSQLITE_TRUSTED_SCHEMA=0 \
2571	2573	-DHAVE_USLEEP \
2572	2574

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -2533,10 +2533,11 @@
2533	-DSQLITE_ENABLE_DBSTAT_VTAB \
2534	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2535	-DSQLITE_ENABLE_FTS4 \
2536	-DSQLITE_ENABLE_FTS5 \
2537	-DSQLITE_ENABLE_MATH_FUNCTIONS \

2538	-DSQLITE_ENABLE_STMTVTAB \
2539	-DSQLITE_HAVE_ZLIB \
2540	-DSQLITE_ENABLE_DBPAGE_VTAB \
2541	-DSQLITE_TRUSTED_SCHEMA=0 \
2542	-DHAVE_USLEEP \
	@@ -2562,10 +2563,11 @@
2562	-DSQLITE_ENABLE_DBSTAT_VTAB \
2563	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2564	-DSQLITE_ENABLE_FTS4 \
2565	-DSQLITE_ENABLE_FTS5 \
2566	-DSQLITE_ENABLE_MATH_FUNCTIONS \

2567	-DSQLITE_ENABLE_STMTVTAB \
2568	-DSQLITE_HAVE_ZLIB \
2569	-DSQLITE_ENABLE_DBPAGE_VTAB \
2570	-DSQLITE_TRUSTED_SCHEMA=0 \
2571	-DHAVE_USLEEP \
2572

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -2533,10 +2533,11 @@
2533	-DSQLITE_ENABLE_DBSTAT_VTAB \
2534	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2535	-DSQLITE_ENABLE_FTS4 \
2536	-DSQLITE_ENABLE_FTS5 \
2537	-DSQLITE_ENABLE_MATH_FUNCTIONS \
2538	-DSQLITE_ENABLE_SETLK_TIMEOUT \
2539	-DSQLITE_ENABLE_STMTVTAB \
2540	-DSQLITE_HAVE_ZLIB \
2541	-DSQLITE_ENABLE_DBPAGE_VTAB \
2542	-DSQLITE_TRUSTED_SCHEMA=0 \
2543	-DHAVE_USLEEP \
	@@ -2562,10 +2563,11 @@
2563	-DSQLITE_ENABLE_DBSTAT_VTAB \
2564	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2565	-DSQLITE_ENABLE_FTS4 \
2566	-DSQLITE_ENABLE_FTS5 \
2567	-DSQLITE_ENABLE_MATH_FUNCTIONS \
2568	-DSQLITE_ENABLE_SETLK_TIMEOUT \
2569	-DSQLITE_ENABLE_STMTVTAB \
2570	-DSQLITE_HAVE_ZLIB \
2571	-DSQLITE_ENABLE_DBPAGE_VTAB \
2572	-DSQLITE_TRUSTED_SCHEMA=0 \
2573	-DHAVE_USLEEP \
2574

M win/Makefile.msc

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -316,10 +316,11 @@
316	316	/DSQLITE_ENABLE_DBSTAT_VTAB \
317	317	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
318	318	/DSQLITE_ENABLE_FTS4 \
319	319	/DSQLITE_ENABLE_FTS5 \
320	320	/DSQLITE_ENABLE_MATH_FUNCTIONS \
	321	+ /DSQLITE_ENABLE_SETLK_TIMEOUT \
321	322	/DSQLITE_ENABLE_STMTVTAB \
322	323	/DSQLITE_HAVE_ZLIB \
323	324	/DSQLITE_ENABLE_DBPAGE_VTAB \
324	325	/DSQLITE_TRUSTED_SCHEMA=0 \
325	326	/DHAVE_USLEEP \
		@@ -342,10 +343,11 @@
342	343	/DSQLITE_ENABLE_DBSTAT_VTAB \
343	344	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
344	345	/DSQLITE_ENABLE_FTS4 \
345	346	/DSQLITE_ENABLE_FTS5 \
346	347	/DSQLITE_ENABLE_MATH_FUNCTIONS \
	348	+ /DSQLITE_ENABLE_SETLK_TIMEOUT \
347	349	/DSQLITE_ENABLE_STMTVTAB \
348	350	/DSQLITE_HAVE_ZLIB \
349	351	/DSQLITE_ENABLE_DBPAGE_VTAB \
350	352	/DSQLITE_TRUSTED_SCHEMA=0 \
351	353	/DHAVE_USLEEP \
352	354

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -316,10 +316,11 @@
316	/DSQLITE_ENABLE_DBSTAT_VTAB \
317	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
318	/DSQLITE_ENABLE_FTS4 \
319	/DSQLITE_ENABLE_FTS5 \
320	/DSQLITE_ENABLE_MATH_FUNCTIONS \

321	/DSQLITE_ENABLE_STMTVTAB \
322	/DSQLITE_HAVE_ZLIB \
323	/DSQLITE_ENABLE_DBPAGE_VTAB \
324	/DSQLITE_TRUSTED_SCHEMA=0 \
325	/DHAVE_USLEEP \
	@@ -342,10 +343,11 @@
342	/DSQLITE_ENABLE_DBSTAT_VTAB \
343	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
344	/DSQLITE_ENABLE_FTS4 \
345	/DSQLITE_ENABLE_FTS5 \
346	/DSQLITE_ENABLE_MATH_FUNCTIONS \

347	/DSQLITE_ENABLE_STMTVTAB \
348	/DSQLITE_HAVE_ZLIB \
349	/DSQLITE_ENABLE_DBPAGE_VTAB \
350	/DSQLITE_TRUSTED_SCHEMA=0 \
351	/DHAVE_USLEEP \
352

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -316,10 +316,11 @@
316	/DSQLITE_ENABLE_DBSTAT_VTAB \
317	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
318	/DSQLITE_ENABLE_FTS4 \
319	/DSQLITE_ENABLE_FTS5 \
320	/DSQLITE_ENABLE_MATH_FUNCTIONS \
321	/DSQLITE_ENABLE_SETLK_TIMEOUT \
322	/DSQLITE_ENABLE_STMTVTAB \
323	/DSQLITE_HAVE_ZLIB \
324	/DSQLITE_ENABLE_DBPAGE_VTAB \
325	/DSQLITE_TRUSTED_SCHEMA=0 \
326	/DHAVE_USLEEP \
	@@ -342,10 +343,11 @@
343	/DSQLITE_ENABLE_DBSTAT_VTAB \
344	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
345	/DSQLITE_ENABLE_FTS4 \
346	/DSQLITE_ENABLE_FTS5 \
347	/DSQLITE_ENABLE_MATH_FUNCTIONS \
348	/DSQLITE_ENABLE_SETLK_TIMEOUT \
349	/DSQLITE_ENABLE_STMTVTAB \
350	/DSQLITE_HAVE_ZLIB \
351	/DSQLITE_ENABLE_DBPAGE_VTAB \
352	/DSQLITE_TRUSTED_SCHEMA=0 \
353	/DHAVE_USLEEP \
354

M www/changes.wiki

+40 -14

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -1,12 +1,29 @@
1	1	<title>Change Log</title>
2	2
3		-<h2 id='v2_26'>Changes for version 2.26 (pending)</h2><ol>
	3	+<h2 id='v2_27'>Changes for version 2.27 (pending)</h2><ol>
	4	+ <li> Fix a SQL injection on the [/help?cmd=/file\|/file page]. Thanks to
	5	+ additional defenses built into Fossil, as well as good luck, this injection
	6	+ is not exploitable for either data exfiltration or privilege escalation. The
	7	+ only possible result of invoking the injection is a harmless SQL syntax error.
	8	+ (The [https://en.wikipedia.org/wiki/Swiss_cheese_model\|holes in the Swiss cheese]
	9	+ did not line up!)
	10	+ <li> Enhance the chng= query parameter on the [/help?cmd=/timeline\|timeline page]
	11	+ so that it works with other query parameters like p=, d=, from=, and to=.
	12	+ <li> Always include nodes identify by sel1= and sel2= in the /timeline display.
	13	+ <li> Enable the --editor option on the [/help?cmd=amend\|fossil amend] command.
	14	+ <li> Require at least an anonymous login to access the /blame page and similar,
	15	+ to help prevent robots from soaking up excess CPU time on such pages.
	16	+ <li> When walking the filesystem looking for Fossil repositories, avoid descending
	17	+ into directories named "/proc".
	18	+ </ol>
	19	+
	20	+<h2 id='v2_26'>Changes for version 2.26 (2025-04-30)</h2><ol>
4	21	<li>Enhancements to [/help?cmd=diff\|fossil diff] and similar:
5	22	<ol type="a">
6		- <li> The --from can optionally accept a directory name as its argument,
7		- and uses files under that directory as the baseline for the diff.
	23	+ <li> The argument to the --from option can be a directory name, causing
	24	+ Fossil to use files under that directory as the baseline for the diff.
8	25	<li> For "gdiff", if no [/help?cmd=gdiff-command\|gdiff-command setting]
9	26	is defined, Fossil tries to do a --tk diff if "tclsh" and "wish"
10	27	are available, or a --by diff if not.
11	28	<li> The "Reload" button is added to --tk diffs, to bring the displayed
12	29	diff up to date with the latest changes on disk.
		@@ -44,11 +61,13 @@
44	61	him or her the opportunity to edit the comment before continuing.
45	62	This feature is controllable by the
46	63	[/help?cmd=verify-comments\|verify-comments setting].
47	64	<li> The new "--if-changes" option causes the commit to become
48	65	a quiet no-op if there are no pending changes.
49		- <li> Added the ability to sign check-ins with SSH keys.
	66	+ <li> Added the ability to sign check-ins with SSH keys. Artifacts signed
	67	+ this way are ignored by all previous fossil versions, as if they
	68	+ were plain-text file content instead of Fossil artifacts.
50	69	<li> Issue a warning if a user tries to commit on a check-in where the
51	70	branch has been changed.
52	71	<li> The interactive checkin comment prompt shows the formatting rules
53	72	set for that repository.
54	73	<li> Add the "--editor" option.
		@@ -84,13 +103,13 @@
84	103	<li> Accept the "Z" (Zulu-time) suffix on date arguments for the
85	104	"ymd" and "yw" query parameters.
86	105	<li> The new "min" query parameter, when added to a from=,to= query,
87	106	collapses long runs of check-ins on the same branch into just
88	107	end-points.
89		- <li> The p= and d= parameters an reference different check-ins, which
90		- case the timeline shows those check-ins that are both ancestors
91		- of p= and descendants of d=.
	108	+ <li> The p= and d= parameters can now reference different check-ins,
	109	+ in which case the timeline shows those check-ins that are both
	110	+ ancestors of p= and descendants of d=.
92	111	<li> The saturation and intensity of user-specified checkin and branch
93	112	background colors are automatically adjusted to keep the colors
94	113	compatible with the current skin, unless the
95	114	[/help?cmd=raw-bgcolor\|raw-bgcolor setting] is turned on.
96	115	</ol>
		@@ -119,11 +138,11 @@
119	138	COMMAND argument and only shows results for the specified
120	139	subcommand, not the entire command.
121	140	<li> The -u (--usage) option shows only the command-line syntax
122	141	<li> The -o (--options) option shows only the command-line options
123	142	</ol>
124		- <li>Enhancements to the ticket system:
	143	+ <li>Enhancements to the [./tickets.wiki\|ticket system]:
125	144	<ol type="a">
126	145	<li> Added the ability to attach wiki pages to a ticket for extended
127	146	descriptions.
128	147	<li> Added submenu to the 'View Ticket' page, to use it as
129	148	template for a new ticket.
		@@ -136,14 +155,15 @@
136	155	<li>Added the "hash" query parameter to the
137	156	[/help?cmd=/whatis\|/whatis webpage].
138	157	<li>Add a "user permissions changes" [/doc/trunk/www/alerts.md\|subscription]
139	158	which alerts subscribers when an admin creates a new user or
140	159	when a user's permissions change.
141		- <li>Show project description on repository list.
142		- <li>Make [/help?cmd=/chat\|/chat] better-behaved during server outages, reducing
143		- the frequency of reconnection attempts over time and providing feedback
144		- to the user when the connection is down.
	160	+ <li>If the FOSSIL_REPOLIST_SHOW environment variable exists and contains
	161	+ the substring "description", then the project description for each repository
	162	+ is shown on the repository list page. The login-group for each project is
	163	+ now only shown if the FOSSIL_REPOLIST_SHOW environment variable exists and
	164	+ contains the substring "login-group". ([./cgi.wiki#repolist\|More information])
145	165	<li>The [/doc/trunk/www/th1.md\|TH1 script language] is enhanced for improved
146	166	security:
147	167	<ol type="a">
148	168	<li> TH1 now makes a distinction between
149	169	[/doc/trunk/www/th1.md#taint\|tainted and untainted string values].
		@@ -154,10 +174,17 @@
154	174	security problem.
155	175	<li> The "--th" option was removed from the [/help?cmd=pikchr\|fossil pikchr]
156	176	command.
157	177	<li> The "enable_htmlify" TH1 command was removed.
158	178	</ol>
	179	+ <li>Make [/help?cmd=/chat\|/chat] better-behaved during server outages, reducing
	180	+ the frequency of reconnection attempts over time and providing feedback
	181	+ to the user when the connection is down.
	182	+ <li>The [/help?cmd=/sqlar\|/sqlar] page does not work for users who are not logged
	183	+ in, nor are links to that page displayed to users who are not logged in. Being
	184	+ logged in as "anonymous" is sufficient to overcome this restriction, assuming
	185	+ that "anonymous" can download tarballs and ZIP archives.
159	186	<li>Many other minor fixes and additions.
160	187	</ol>
161	188
162	189	<h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2>
163	190
		@@ -1176,12 +1203,11 @@
1176	1203	of rows in a timeline) are held in a cookie and thus persist
1177	1204	across multiple pages.
1178	1205	* Rework the skin editing process so that changes are implemented
1179	1206	on one of nine /draft pages, evaluated, then merged back to the
1180	1207	default.
1181		- * Added the [https://fossil-scm.org/skins/ardoise/timeline\|Ardoise]
1182		- skin.
	1208	+ * Added the [/timeline?skin=ardoise&once\|Ardoise] skin.
1183	1209	* Fix the "fossil server" command on Unix to be much more responsive
1184	1210	to multiple simultaneous web requests.
1185	1211	* Use the IPv6 stack for the "fossil ui" and "fossil server"
1186	1212	commands on Windows.
1187	1213	* Support for [https://sqlite.org/sqlar\|SQL Archives] as a download
1188	1214

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,12 +1,29 @@
1	<title>Change Log</title>
2
3	<h2 id='v2_26'>Changes for version 2.26 (pending)</h2><ol>

















4	<li>Enhancements to [/help?cmd=diff\|fossil diff] and similar:
5	<ol type="a">
6	<li> The --from can optionally accept a directory name as its argument,
7	and uses files under that directory as the baseline for the diff.
8	<li> For "gdiff", if no [/help?cmd=gdiff-command\|gdiff-command setting]
9	is defined, Fossil tries to do a --tk diff if "tclsh" and "wish"
10	are available, or a --by diff if not.
11	<li> The "Reload" button is added to --tk diffs, to bring the displayed
12	diff up to date with the latest changes on disk.
	@@ -44,11 +61,13 @@
44	him or her the opportunity to edit the comment before continuing.
45	This feature is controllable by the
46	[/help?cmd=verify-comments\|verify-comments setting].
47	<li> The new "--if-changes" option causes the commit to become
48	a quiet no-op if there are no pending changes.
49	<li> Added the ability to sign check-ins with SSH keys.


50	<li> Issue a warning if a user tries to commit on a check-in where the
51	branch has been changed.
52	<li> The interactive checkin comment prompt shows the formatting rules
53	set for that repository.
54	<li> Add the "--editor" option.
	@@ -84,13 +103,13 @@
84	<li> Accept the "Z" (Zulu-time) suffix on date arguments for the
85	"ymd" and "yw" query parameters.
86	<li> The new "min" query parameter, when added to a from=,to= query,
87	collapses long runs of check-ins on the same branch into just
88	end-points.
89	<li> The p= and d= parameters an reference different check-ins, which
90	case the timeline shows those check-ins that are both ancestors
91	of p= and descendants of d=.
92	<li> The saturation and intensity of user-specified checkin and branch
93	background colors are automatically adjusted to keep the colors
94	compatible with the current skin, unless the
95	[/help?cmd=raw-bgcolor\|raw-bgcolor setting] is turned on.
96	</ol>
	@@ -119,11 +138,11 @@
119	COMMAND argument and only shows results for the specified
120	subcommand, not the entire command.
121	<li> The -u (--usage) option shows only the command-line syntax
122	<li> The -o (--options) option shows only the command-line options
123	</ol>
124	<li>Enhancements to the ticket system:
125	<ol type="a">
126	<li> Added the ability to attach wiki pages to a ticket for extended
127	descriptions.
128	<li> Added submenu to the 'View Ticket' page, to use it as
129	template for a new ticket.
	@@ -136,14 +155,15 @@
136	<li>Added the "hash" query parameter to the
137	[/help?cmd=/whatis\|/whatis webpage].
138	<li>Add a "user permissions changes" [/doc/trunk/www/alerts.md\|subscription]
139	which alerts subscribers when an admin creates a new user or
140	when a user's permissions change.
141	<li>Show project description on repository list.
142	<li>Make [/help?cmd=/chat\|/chat] better-behaved during server outages, reducing
143	the frequency of reconnection attempts over time and providing feedback
144	to the user when the connection is down.

145	<li>The [/doc/trunk/www/th1.md\|TH1 script language] is enhanced for improved
146	security:
147	<ol type="a">
148	<li> TH1 now makes a distinction between
149	[/doc/trunk/www/th1.md#taint\|tainted and untainted string values].
	@@ -154,10 +174,17 @@
154	security problem.
155	<li> The "--th" option was removed from the [/help?cmd=pikchr\|fossil pikchr]
156	command.
157	<li> The "enable_htmlify" TH1 command was removed.
158	</ol>







159	<li>Many other minor fixes and additions.
160	</ol>
161
162	<h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2>
163
	@@ -1176,12 +1203,11 @@
1176	of rows in a timeline) are held in a cookie and thus persist
1177	across multiple pages.
1178	* Rework the skin editing process so that changes are implemented
1179	on one of nine /draft pages, evaluated, then merged back to the
1180	default.
1181	* Added the [https://fossil-scm.org/skins/ardoise/timeline\|Ardoise]
1182	skin.
1183	* Fix the "fossil server" command on Unix to be much more responsive
1184	to multiple simultaneous web requests.
1185	* Use the IPv6 stack for the "fossil ui" and "fossil server"
1186	commands on Windows.
1187	* Support for [https://sqlite.org/sqlar\|SQL Archives] as a download
1188

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,12 +1,29 @@
1	<title>Change Log</title>
2
3	<h2 id='v2_27'>Changes for version 2.27 (pending)</h2><ol>
4	<li> Fix a SQL injection on the [/help?cmd=/file\|/file page]. Thanks to
5	additional defenses built into Fossil, as well as good luck, this injection
6	is not exploitable for either data exfiltration or privilege escalation. The
7	only possible result of invoking the injection is a harmless SQL syntax error.
8	(The [https://en.wikipedia.org/wiki/Swiss_cheese_model\|holes in the Swiss cheese]
9	did not line up!)
10	<li> Enhance the chng= query parameter on the [/help?cmd=/timeline\|timeline page]
11	so that it works with other query parameters like p=, d=, from=, and to=.
12	<li> Always include nodes identify by sel1= and sel2= in the /timeline display.
13	<li> Enable the --editor option on the [/help?cmd=amend\|fossil amend] command.
14	<li> Require at least an anonymous login to access the /blame page and similar,
15	to help prevent robots from soaking up excess CPU time on such pages.
16	<li> When walking the filesystem looking for Fossil repositories, avoid descending
17	into directories named "/proc".
18	</ol>
19
20	<h2 id='v2_26'>Changes for version 2.26 (2025-04-30)</h2><ol>
21	<li>Enhancements to [/help?cmd=diff\|fossil diff] and similar:
22	<ol type="a">
23	<li> The argument to the --from option can be a directory name, causing
24	Fossil to use files under that directory as the baseline for the diff.
25	<li> For "gdiff", if no [/help?cmd=gdiff-command\|gdiff-command setting]
26	is defined, Fossil tries to do a --tk diff if "tclsh" and "wish"
27	are available, or a --by diff if not.
28	<li> The "Reload" button is added to --tk diffs, to bring the displayed
29	diff up to date with the latest changes on disk.
	@@ -44,11 +61,13 @@
61	him or her the opportunity to edit the comment before continuing.
62	This feature is controllable by the
63	[/help?cmd=verify-comments\|verify-comments setting].
64	<li> The new "--if-changes" option causes the commit to become
65	a quiet no-op if there are no pending changes.
66	<li> Added the ability to sign check-ins with SSH keys. Artifacts signed
67	this way are ignored by all previous fossil versions, as if they
68	were plain-text file content instead of Fossil artifacts.
69	<li> Issue a warning if a user tries to commit on a check-in where the
70	branch has been changed.
71	<li> The interactive checkin comment prompt shows the formatting rules
72	set for that repository.
73	<li> Add the "--editor" option.
	@@ -84,13 +103,13 @@
103	<li> Accept the "Z" (Zulu-time) suffix on date arguments for the
104	"ymd" and "yw" query parameters.
105	<li> The new "min" query parameter, when added to a from=,to= query,
106	collapses long runs of check-ins on the same branch into just
107	end-points.
108	<li> The p= and d= parameters can now reference different check-ins,
109	in which case the timeline shows those check-ins that are both
110	ancestors of p= and descendants of d=.
111	<li> The saturation and intensity of user-specified checkin and branch
112	background colors are automatically adjusted to keep the colors
113	compatible with the current skin, unless the
114	[/help?cmd=raw-bgcolor\|raw-bgcolor setting] is turned on.
115	</ol>
	@@ -119,11 +138,11 @@
138	COMMAND argument and only shows results for the specified
139	subcommand, not the entire command.
140	<li> The -u (--usage) option shows only the command-line syntax
141	<li> The -o (--options) option shows only the command-line options
142	</ol>
143	<li>Enhancements to the [./tickets.wiki\|ticket system]:
144	<ol type="a">
145	<li> Added the ability to attach wiki pages to a ticket for extended
146	descriptions.
147	<li> Added submenu to the 'View Ticket' page, to use it as
148	template for a new ticket.
	@@ -136,14 +155,15 @@
155	<li>Added the "hash" query parameter to the
156	[/help?cmd=/whatis\|/whatis webpage].
157	<li>Add a "user permissions changes" [/doc/trunk/www/alerts.md\|subscription]
158	which alerts subscribers when an admin creates a new user or
159	when a user's permissions change.
160	<li>If the FOSSIL_REPOLIST_SHOW environment variable exists and contains
161	the substring "description", then the project description for each repository
162	is shown on the repository list page. The login-group for each project is
163	now only shown if the FOSSIL_REPOLIST_SHOW environment variable exists and
164	contains the substring "login-group". ([./cgi.wiki#repolist\|More information])
165	<li>The [/doc/trunk/www/th1.md\|TH1 script language] is enhanced for improved
166	security:
167	<ol type="a">
168	<li> TH1 now makes a distinction between
169	[/doc/trunk/www/th1.md#taint\|tainted and untainted string values].
	@@ -154,10 +174,17 @@
174	security problem.
175	<li> The "--th" option was removed from the [/help?cmd=pikchr\|fossil pikchr]
176	command.
177	<li> The "enable_htmlify" TH1 command was removed.
178	</ol>
179	<li>Make [/help?cmd=/chat\|/chat] better-behaved during server outages, reducing
180	the frequency of reconnection attempts over time and providing feedback
181	to the user when the connection is down.
182	<li>The [/help?cmd=/sqlar\|/sqlar] page does not work for users who are not logged
183	in, nor are links to that page displayed to users who are not logged in. Being
184	logged in as "anonymous" is sufficient to overcome this restriction, assuming
185	that "anonymous" can download tarballs and ZIP archives.
186	<li>Many other minor fixes and additions.
187	</ol>
188
189	<h2 id='v2_25'>Changes for version 2.25 (2024-11-06)</h2>
190
	@@ -1176,12 +1203,11 @@
1203	of rows in a timeline) are held in a cookie and thus persist
1204	across multiple pages.
1205	* Rework the skin editing process so that changes are implemented
1206	on one of nine /draft pages, evaluated, then merged back to the
1207	default.
1208	* Added the [/timeline?skin=ardoise&once\|Ardoise] skin.

1209	* Fix the "fossil server" command on Unix to be much more responsive
1210	to multiple simultaneous web requests.
1211	* Use the IPv6 stack for the "fossil ui" and "fossil server"
1212	commands on Windows.
1213	* Support for [https://sqlite.org/sqlar\|SQL Archives] as a download
1214

M www/containers.md

+1 -1

		--- www/containers.md
		+++ www/containers.md
		@@ -670,11 +670,11 @@
670	670
671	671	[pmmac]: https://podman.io/getting-started/installation.html#macos
672	672	[pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
673	673	[Podman]: https://podman.io/
674	674	[rl]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
675		-[whatis]: https://podman.io/whatis.html
	675	+[whatis]: https://docs.podman.io/en/latest/index.html
676	676
677	677
678	678	### 6.3 <a id="nspawn"></a>`systemd-container`
679	679
680	680	If even the Podman stack is too big for you, the next-best option I’m
681	681

	--- www/containers.md
	+++ www/containers.md
	@@ -670,11 +670,11 @@
670
671	[pmmac]: https://podman.io/getting-started/installation.html#macos
672	[pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
673	[Podman]: https://podman.io/
674	[rl]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
675	[whatis]: https://podman.io/whatis.html
676
677
678	### 6.3 <a id="nspawn"></a>`systemd-container`
679
680	If even the Podman stack is too big for you, the next-best option I’m
681

	--- www/containers.md
	+++ www/containers.md
	@@ -670,11 +670,11 @@
670
671	[pmmac]: https://podman.io/getting-started/installation.html#macos
672	[pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
673	[Podman]: https://podman.io/
674	[rl]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
675	[whatis]: https://docs.podman.io/en/latest/index.html
676
677
678	### 6.3 <a id="nspawn"></a>`systemd-container`
679
680	If even the Podman stack is too big for you, the next-best option I’m
681

M www/customskin.md

+37 -1

		--- www/customskin.md
		+++ www/customskin.md
		@@ -310,10 +310,11 @@
310	310	with the "--skin ./newskin" option. If the argument to the --skin
311	311	option contains a "/" character, then the five control files are
312	312	read out of the directory named. You can then edit the control
313	313	files in the ./newskin folder using you favorite text editor, and
314	314	press "Reload" on your browser to see the effects.
	315	+
315	316
316	317	### Disabling The Web Browser Cache During Development
317	318
318	319	Fossil is aggressive about asking the web browser to cache
319	320	resources. While developing a new skin, it is often helpful to
		@@ -526,11 +527,46 @@
526	527	Iterate until the desired look is achieved.
527	528
528	529	4. Copy/paste the resulting css.txt, details.txt,
529	530	header.txt, and footer.txt files
530	531	into the CSS, details, header, and footer configuration screens
531		- under the Admin/Skins menu.
	532	+ under the Admin/Skins menu. Alternately, import them using the
	533	+ process described below.
	534	+
	535	+An alternative to step 4 is to convert the skin files into a form
	536	+which can be imported into a repository using `fossil config import`.
	537	+It requires compiling [a small tool from the fossil source
	538	+tree](/file/tools/skintxt2config.c):
	539	+
	540	+>
	541	+```
	542	+$ cc -o s2c /path/to/fossil/checkout/tools/skintxt2config.c
	543	+```
	544	+
	545	+With that in place, the custom skin files can be converted with:
	546	+
	547	+>
	548	+```
	549	+$ ./s2c yourskin/*.txt > skin.config
	550	+```
	551	+
	552	+It can be imported into an arbitrary fossil repository with:
	553	+
	554	+>
	555	+```
	556	+$ fossil config import skin.config
	557	+```
	558	+
	559	+And it can be pushed to a remote repository with:
	560	+
	561	+>
	562	+```
	563	+$ fossil config push skin
	564	+```
	565	+
	566	+That approach has proven to be an effective way to locally develop
	567	+skin changes then push them to a "live" site.
532	568
533	569
534	570	## See Also
535	571
536	572	* [Customizing the Timeline Graph](customgraph.md)
537	573

	--- www/customskin.md
	+++ www/customskin.md
	@@ -310,10 +310,11 @@
310	with the "--skin ./newskin" option. If the argument to the --skin
311	option contains a "/" character, then the five control files are
312	read out of the directory named. You can then edit the control
313	files in the ./newskin folder using you favorite text editor, and
314	press "Reload" on your browser to see the effects.

315
316	### Disabling The Web Browser Cache During Development
317
318	Fossil is aggressive about asking the web browser to cache
319	resources. While developing a new skin, it is often helpful to
	@@ -526,11 +527,46 @@
526	Iterate until the desired look is achieved.
527
528	4. Copy/paste the resulting css.txt, details.txt,
529	header.txt, and footer.txt files
530	into the CSS, details, header, and footer configuration screens
531	under the Admin/Skins menu.



































532
533
534	## See Also
535
536	* [Customizing the Timeline Graph](customgraph.md)
537

	--- www/customskin.md
	+++ www/customskin.md
	@@ -310,10 +310,11 @@
310	with the "--skin ./newskin" option. If the argument to the --skin
311	option contains a "/" character, then the five control files are
312	read out of the directory named. You can then edit the control
313	files in the ./newskin folder using you favorite text editor, and
314	press "Reload" on your browser to see the effects.
315
316
317	### Disabling The Web Browser Cache During Development
318
319	Fossil is aggressive about asking the web browser to cache
320	resources. While developing a new skin, it is often helpful to
	@@ -526,11 +527,46 @@
527	Iterate until the desired look is achieved.
528
529	4. Copy/paste the resulting css.txt, details.txt,
530	header.txt, and footer.txt files
531	into the CSS, details, header, and footer configuration screens
532	under the Admin/Skins menu. Alternately, import them using the
533	process described below.
534
535	An alternative to step 4 is to convert the skin files into a form
536	which can be imported into a repository using `fossil config import`.
537	It requires compiling [a small tool from the fossil source
538	tree](/file/tools/skintxt2config.c):
539
540	>
541	```
542	$ cc -o s2c /path/to/fossil/checkout/tools/skintxt2config.c
543	```
544
545	With that in place, the custom skin files can be converted with:
546
547	>
548	```
549	$ ./s2c yourskin/*.txt > skin.config
550	```
551
552	It can be imported into an arbitrary fossil repository with:
553
554	>
555	```
556	$ fossil config import skin.config
557	```
558
559	And it can be pushed to a remote repository with:
560
561	>
562	```
563	$ fossil config push skin
564	```
565
566	That approach has proven to be an effective way to locally develop
567	skin changes then push them to a "live" site.
568
569
570	## See Also
571
572	* [Customizing the Timeline Graph](customgraph.md)
573

M www/fossil-v-git.wiki

+2 -2

		--- www/fossil-v-git.wiki
		+++ www/fossil-v-git.wiki
		@@ -274,11 +274,11 @@
274	274	Git lets you see "what came before". Fossil makes it just as
275	275	easy to also see "what came after".
276	276
277	277	Leaf check-ins in Git that lack a "ref" become "detached," making them
278	278	difficult to locate and subject to garbage collection. This
279		-[http://gitfaq.org/1/01/what-is-a-detached-head/\|detached head
	279	+[https://stackoverflow.com/q/3965676 \| detached head
280	280	state] problem has caused grief for
281	281	[https://www.google.com/search?q=git+detached+head+state \| many
282	282	Git users]. With
283	283	Fossil, detached heads are simply impossible because we can always find
284	284	our way back into the Merkle tree using one or more of the relations
		@@ -342,11 +342,11 @@
342	342	Fossil isn't entirely C and SQL code. Its web UI [./javascript.md \|
343	343	uses JavaScript where
344	344	necessary]. The server-side
345	345	UI scripting uses a custom minimal
346	346	[https://en.wikipedia.org/wiki/Tcl\|Tcl] dialect called
347		-[https://fossil-scm.org/xfer/doc/trunk/www/th1.md\|TH1], which is
	347	+[./th1.md\|TH1], which is
348	348	embedded into Fossil itself. Fossil's build system and test suite are
349	349	largely based on Tcl.⁵ All of this is quite portable.
350	350
351	351	About half of Git's code is POSIX C, and about a third is POSIX shell
352	352	code. This is largely why the so-called "Git for Windows" distributions
353	353

	--- www/fossil-v-git.wiki
	+++ www/fossil-v-git.wiki
	@@ -274,11 +274,11 @@
274	Git lets you see "what came before". Fossil makes it just as
275	easy to also see "what came after".
276
277	Leaf check-ins in Git that lack a "ref" become "detached," making them
278	difficult to locate and subject to garbage collection. This
279	[http://gitfaq.org/1/01/what-is-a-detached-head/\|detached head
280	state] problem has caused grief for
281	[https://www.google.com/search?q=git+detached+head+state \| many
282	Git users]. With
283	Fossil, detached heads are simply impossible because we can always find
284	our way back into the Merkle tree using one or more of the relations
	@@ -342,11 +342,11 @@
342	Fossil isn't entirely C and SQL code. Its web UI [./javascript.md \|
343	uses JavaScript where
344	necessary]. The server-side
345	UI scripting uses a custom minimal
346	[https://en.wikipedia.org/wiki/Tcl\|Tcl] dialect called
347	[https://fossil-scm.org/xfer/doc/trunk/www/th1.md\|TH1], which is
348	embedded into Fossil itself. Fossil's build system and test suite are
349	largely based on Tcl.⁵ All of this is quite portable.
350
351	About half of Git's code is POSIX C, and about a third is POSIX shell
352	code. This is largely why the so-called "Git for Windows" distributions
353

	--- www/fossil-v-git.wiki
	+++ www/fossil-v-git.wiki
	@@ -274,11 +274,11 @@
274	Git lets you see "what came before". Fossil makes it just as
275	easy to also see "what came after".
276
277	Leaf check-ins in Git that lack a "ref" become "detached," making them
278	difficult to locate and subject to garbage collection. This
279	[https://stackoverflow.com/q/3965676 \| detached head
280	state] problem has caused grief for
281	[https://www.google.com/search?q=git+detached+head+state \| many
282	Git users]. With
283	Fossil, detached heads are simply impossible because we can always find
284	our way back into the Merkle tree using one or more of the relations
	@@ -342,11 +342,11 @@
342	Fossil isn't entirely C and SQL code. Its web UI [./javascript.md \|
343	uses JavaScript where
344	necessary]. The server-side
345	UI scripting uses a custom minimal
346	[https://en.wikipedia.org/wiki/Tcl\|Tcl] dialect called
347	[./th1.md\|TH1], which is
348	embedded into Fossil itself. Fossil's build system and test suite are
349	largely based on Tcl.⁵ All of this is quite portable.
350
351	About half of Git's code is POSIX C, and about a third is POSIX shell
352	code. This is largely why the so-called "Git for Windows" distributions
353

M www/gsoc-ideas.md

+1 -1

		--- www/gsoc-ideas.md
		+++ www/gsoc-ideas.md
		@@ -24,11 +24,11 @@
24	24	# UI, Look and Feel
25	25
26	26	Tasks for those interested in graphic/web design:
27	27
28	28	* Add a quote button to the Forum, such as [discussed in this thread](https://fossil-scm.org/forum/forumpost/7ad03cd73d)
29		-* Improve the documentation history-browsing page to enable selection of 2 arbitrary versions to diff, similar to the [Mediawiki history feature enabled on Wikipedia](https://en.wikipedia.org/w/index.php?title=Fossil_(software)&action=history)
	29	+* Improve the documentation history-browsing page to enable selection of 2 arbitrary versions to diff, similar to the [Mediawiki history feature enabled on Wikipedia](https://en.wikipedia.org/w/index.php?title=Fossil_$software$&action=history)
30	30	* Allow diffing of Forum posts
31	31	* General touch-ups in the existing skins. This may, depending on how deep one
32	32	cares to dig, require digging into C code to find, and potentially modify, how
33	33	the HTML is generated.
34	34	* Creation of one or more new skins. This does not specifically require any C
35	35

	--- www/gsoc-ideas.md
	+++ www/gsoc-ideas.md
	@@ -24,11 +24,11 @@
24	# UI, Look and Feel
25
26	Tasks for those interested in graphic/web design:
27
28	* Add a quote button to the Forum, such as [discussed in this thread](https://fossil-scm.org/forum/forumpost/7ad03cd73d)
29	* Improve the documentation history-browsing page to enable selection of 2 arbitrary versions to diff, similar to the [Mediawiki history feature enabled on Wikipedia](https://en.wikipedia.org/w/index.php?title=Fossil_(software)&action=history)
30	* Allow diffing of Forum posts
31	* General touch-ups in the existing skins. This may, depending on how deep one
32	cares to dig, require digging into C code to find, and potentially modify, how
33	the HTML is generated.
34	* Creation of one or more new skins. This does not specifically require any C
35

	--- www/gsoc-ideas.md
	+++ www/gsoc-ideas.md
	@@ -24,11 +24,11 @@
24	# UI, Look and Feel
25
26	Tasks for those interested in graphic/web design:
27
28	* Add a quote button to the Forum, such as [discussed in this thread](https://fossil-scm.org/forum/forumpost/7ad03cd73d)
29	* Improve the documentation history-browsing page to enable selection of 2 arbitrary versions to diff, similar to the [Mediawiki history feature enabled on Wikipedia](https://en.wikipedia.org/w/index.php?title=Fossil_$software$&action=history)
30	* Allow diffing of Forum posts
31	* General touch-ups in the existing skins. This may, depending on how deep one
32	cares to dig, require digging into C code to find, and potentially modify, how
33	the HTML is generated.
34	* Creation of one or more new skins. This does not specifically require any C
35

M www/index.wiki

+4 -4

		--- www/index.wiki
		+++ www/index.wiki
		@@ -84,16 +84,16 @@
84	84	the repository are consistent prior to each commit.
85	85
86	86	8. <b>Free and Open-Source</b> — [../COPYRIGHT-BSD2.txt\|2-clause BSD license].
87	87
88	88	<hr>
89		-<h3>Latest Release: 2.25 ([/timeline?c=version-2.25\|2024-11-06])</h3>
	89	+<h3>Latest Release: 2.26 ([/timeline?c=version-2.26\|2025-04-30])</h3>
90	90
91	91	* [/uv/download.html\|Download]
92		- * [./changes.wiki#v2_25\|Change Summary]
93		- * [/timeline?p=version-2.25&bt=version-2.24&y=ci\|Check-ins in version 2.25]
94		- * [/timeline?df=version-2.25&y=ci\|Check-ins derived from the 2.25 release]
	92	+ * [./changes.wiki#v2_26\|Change Summary]
	93	+ * [/timeline?p=version-2.26&d=version-2.25&y=ci\|Check-ins in version 2.26]
	94	+ * [/timeline?df=version-2.26&y=ci\|Check-ins derived from the 2.26 release]
95	95	* [/timeline?t=release\|Timeline of all past releases]
96	96
97	97	<hr>
98	98	<h3>Quick Start</h3>
99	99
100	100

	--- www/index.wiki
	+++ www/index.wiki
	@@ -84,16 +84,16 @@
84	the repository are consistent prior to each commit.
85
86	8. <b>Free and Open-Source</b> — [../COPYRIGHT-BSD2.txt\|2-clause BSD license].
87
88	<hr>
89	<h3>Latest Release: 2.25 ([/timeline?c=version-2.25\|2024-11-06])</h3>
90
91	* [/uv/download.html\|Download]
92	* [./changes.wiki#v2_25\|Change Summary]
93	* [/timeline?p=version-2.25&bt=version-2.24&y=ci\|Check-ins in version 2.25]
94	* [/timeline?df=version-2.25&y=ci\|Check-ins derived from the 2.25 release]
95	* [/timeline?t=release\|Timeline of all past releases]
96
97	<hr>
98	<h3>Quick Start</h3>
99
100

	--- www/index.wiki
	+++ www/index.wiki
	@@ -84,16 +84,16 @@
84	the repository are consistent prior to each commit.
85
86	8. <b>Free and Open-Source</b> — [../COPYRIGHT-BSD2.txt\|2-clause BSD license].
87
88	<hr>
89	<h3>Latest Release: 2.26 ([/timeline?c=version-2.26\|2025-04-30])</h3>
90
91	* [/uv/download.html\|Download]
92	* [./changes.wiki#v2_26\|Change Summary]
93	* [/timeline?p=version-2.26&d=version-2.25&y=ci\|Check-ins in version 2.26]
94	* [/timeline?df=version-2.26&y=ci\|Check-ins derived from the 2.26 release]
95	* [/timeline?t=release\|Timeline of all past releases]
96
97	<hr>
98	<h3>Quick Start</h3>
99
100

M www/quickstart.wiki

+1 -1

		--- www/quickstart.wiki
		+++ www/quickstart.wiki
		@@ -196,11 +196,11 @@
196	196	separate directories from the same repository. This enables you,
197	197	for example, to do builds from multiple branches or versions at
198	198	the same time without having to generate extra clones.
199	199
200	200	To switch a checkout between different versions and branches,
201		-use:<
	201	+use:
202	202
203	203	<pre>
204	204	<b>[/help/update \| fossil update]</b>
205	205	<b>[/help/checkout \| fossil checkout]</b>
206	206	</pre>
207	207

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -196,11 +196,11 @@
196	separate directories from the same repository. This enables you,
197	for example, to do builds from multiple branches or versions at
198	the same time without having to generate extra clones.
199
200	To switch a checkout between different versions and branches,
201	use:<
202
203	<pre>
204	<b>[/help/update \| fossil update]</b>
205	<b>[/help/checkout \| fossil checkout]</b>
206	</pre>
207

	--- www/quickstart.wiki
	+++ www/quickstart.wiki
	@@ -196,11 +196,11 @@
196	separate directories from the same repository. This enables you,
197	for example, to do builds from multiple branches or versions at
198	the same time without having to generate extra clones.
199
200	To switch a checkout between different versions and branches,
201	use:
202
203	<pre>
204	<b>[/help/update \| fossil update]</b>
205	<b>[/help/checkout \| fossil checkout]</b>
206	</pre>
207

M www/reviews.wiki

+16 -18

		--- www/reviews.wiki
		+++ www/reviews.wiki
		@@ -35,33 +35,31 @@
35	35	</div>
36	36
37	37	<b>Stephan Beal writes on 2009-01-11:</b>
38	38
39	39	<div class="indent">
40		-Sometime in late 2007 I came across a link to fossil on
41		-<a href="http://www.sqlite.org/">sqlite.org</a>. It
42		-was a good thing I bookmarked it, because I was never able to find the
43		-link again (it might have been in a bug report or something). The
44		-reasons I first took a close look at it were (A) it stemmed from the
45		-sqlite project, which I've held in high regards for years (e.g. I
46		-wrote JavaScript bindings for it:
47		-<a href="http://spiderape.sourceforge.net/plugins/sqlite/">
48		-http://spiderape.sourceforge.net/plugins/sqlite/</a>), and (B) it could
49		-run as a CGI. That second point might seem a bit archaic, but in
50		-practice CGI is the only way most hosted sites can set up a shared
51		-source repository with multiple user IDs. (i'm not about to give out
52		-my only account password or SSH key for my hosted sites, no matter how
53		-much I trust the other developers, and none of my hosters allow me to
54		-run standalone servers or add Apache modules.)
	40	+Sometime in late 2007 I came across a link to fossil on <a
	41	+href="https://sqlite.org/">sqlite.org</a>. It was a good thing I
	42	+bookmarked it, because I was never able to find the link again (it
	43	+might have been in a bug report or something). The reasons I first
	44	+took a close look at it were (A) it stemmed from the sqlite project,
	45	+which I've held in high regards for years (e.g. I wrote bindings for
	46	+it for Mozilla's SpiderMonkey JavaScript engine), and (B) it could run
	47	+as a CGI. That second point might seem a bit archaic, but in practice
	48	+CGI is the only way most hosted sites can set up a shared source
	49	+repository with multiple user IDs. (i'm not about to give out my only
	50	+account password or SSH key for my hosted sites, no matter how much I
	51	+trust the other developers, and none of my hosters allow me to run
	52	+standalone servers or add Apache modules.)
55	53
56	54	So I tried it out. The thing which bugged me most about it was having
57	55	to type "commit" or "com" instead of "ci" for checking in (as is
58	56	custom in all other systems I've used), despite the fact that fossil
59	57	uses "ci" as a filter in things like the timeline view. Looking back
60	58	now, I have used fossil for about about 95% of my work in the past
61		-year (<a href="http://blog.s11n.net/?p=71"><i>dead link</i></a>), in
62		-over 15 source trees, and I now get tripped up when I have to use svn or cvs.
	59	+year, in over 15 source trees, and I now get tripped up when I have to
	60	+use svn or cvs.
63	61
64	62	So, having got over typing "fossil com -m ...", here's why I love it so much...
65	63
66	64	Point #1: CGI
67	65
		@@ -70,11 +68,11 @@
70	68	(they don't belong to those projects), which I cannot host in google
71	69	code (because google code doesn't allow/recognize Public Domain as a
72	70	license, and I refuse to relicense just to accommodate them), and for
73	71	which SourceForge is overkill (and way too slow). With fossil I can
74	72	create a new repo, have it installed on my hoster
75		-(http://fossil.wanderinghorse.net), and be commiting code to it within
	73	+(https://fossil.wanderinghorse.net), and be commiting code to it within
76	74	5 minutes.
77	75
78	76	Point #2: Wiki
79	77
80	78	I hate wikis. I really do. Always have. They all have a different
81	79

	--- www/reviews.wiki
	+++ www/reviews.wiki
	@@ -35,33 +35,31 @@
35	</div>
36
37	<b>Stephan Beal writes on 2009-01-11:</b>
38
39	<div class="indent">
40	Sometime in late 2007 I came across a link to fossil on
41	<a href="http://www.sqlite.org/">sqlite.org</a>. It
42	was a good thing I bookmarked it, because I was never able to find the
43	link again (it might have been in a bug report or something). The
44	reasons I first took a close look at it were (A) it stemmed from the
45	sqlite project, which I've held in high regards for years (e.g. I
46	wrote JavaScript bindings for it:
47	<a href="http://spiderape.sourceforge.net/plugins/sqlite/">
48	http://spiderape.sourceforge.net/plugins/sqlite/</a>), and (B) it could
49	run as a CGI. That second point might seem a bit archaic, but in
50	practice CGI is the only way most hosted sites can set up a shared
51	source repository with multiple user IDs. (i'm not about to give out
52	my only account password or SSH key for my hosted sites, no matter how
53	much I trust the other developers, and none of my hosters allow me to
54	run standalone servers or add Apache modules.)
55
56	So I tried it out. The thing which bugged me most about it was having
57	to type "commit" or "com" instead of "ci" for checking in (as is
58	custom in all other systems I've used), despite the fact that fossil
59	uses "ci" as a filter in things like the timeline view. Looking back
60	now, I have used fossil for about about 95% of my work in the past
61	year (<a href="http://blog.s11n.net/?p=71"><i>dead link</i></a>), in
62	over 15 source trees, and I now get tripped up when I have to use svn or cvs.
63
64	So, having got over typing "fossil com -m ...", here's why I love it so much...
65
66	Point #1: CGI
67
	@@ -70,11 +68,11 @@
70	(they don't belong to those projects), which I cannot host in google
71	code (because google code doesn't allow/recognize Public Domain as a
72	license, and I refuse to relicense just to accommodate them), and for
73	which SourceForge is overkill (and way too slow). With fossil I can
74	create a new repo, have it installed on my hoster
75	(http://fossil.wanderinghorse.net), and be commiting code to it within
76	5 minutes.
77
78	Point #2: Wiki
79
80	I hate wikis. I really do. Always have. They all have a different
81

	--- www/reviews.wiki
	+++ www/reviews.wiki
	@@ -35,33 +35,31 @@
35	</div>
36
37	<b>Stephan Beal writes on 2009-01-11:</b>
38
39	<div class="indent">
40	Sometime in late 2007 I came across a link to fossil on <a
41	href="https://sqlite.org/">sqlite.org</a>. It was a good thing I
42	bookmarked it, because I was never able to find the link again (it
43	might have been in a bug report or something). The reasons I first
44	took a close look at it were (A) it stemmed from the sqlite project,
45	which I've held in high regards for years (e.g. I wrote bindings for
46	it for Mozilla's SpiderMonkey JavaScript engine), and (B) it could run
47	as a CGI. That second point might seem a bit archaic, but in practice
48	CGI is the only way most hosted sites can set up a shared source
49	repository with multiple user IDs. (i'm not about to give out my only
50	account password or SSH key for my hosted sites, no matter how much I
51	trust the other developers, and none of my hosters allow me to run
52	standalone servers or add Apache modules.)


53
54	So I tried it out. The thing which bugged me most about it was having
55	to type "commit" or "com" instead of "ci" for checking in (as is
56	custom in all other systems I've used), despite the fact that fossil
57	uses "ci" as a filter in things like the timeline view. Looking back
58	now, I have used fossil for about about 95% of my work in the past
59	year, in over 15 source trees, and I now get tripped up when I have to
60	use svn or cvs.
61
62	So, having got over typing "fossil com -m ...", here's why I love it so much...
63
64	Point #1: CGI
65
	@@ -70,11 +68,11 @@
68	(they don't belong to those projects), which I cannot host in google
69	code (because google code doesn't allow/recognize Public Domain as a
70	license, and I refuse to relicense just to accommodate them), and for
71	which SourceForge is overkill (and way too slow). With fossil I can
72	create a new repo, have it installed on my hoster
73	(https://fossil.wanderinghorse.net), and be commiting code to it within
74	5 minutes.
75
76	Point #2: Wiki
77
78	I hate wikis. I really do. Always have. They all have a different
79

M www/signing.md

+5 -1

		--- www/signing.md
		+++ www/signing.md
		@@ -51,15 +51,19 @@
51	51	used.
52	52
53	53	The value for `-n` (the _namespace_) can be changed at will, but care has to be
54	54	taken to use the same value when verifying the signature.
55	55
	56	+Fossil versions prior to 2.26 do not understand SSH signatures and
	57	+will treat artifacts signed this way as opaque blobs, not Fossil
	58	+artifacts.
	59	+
56	60
57	61	## Verifying a signature
58	62
59	63	Fossil does not provide an internal method for verifying signatures and
60		-relies – like it does for signing – on external tools.
	64	+relies – like it does for signing – on external tools.
61	65
62	66	### GnuPG
63	67
64	68	Assuming you used the
65	69	default GPG command for signing, one can verify the signature using
66	70

	--- www/signing.md
	+++ www/signing.md
	@@ -51,15 +51,19 @@
51	used.
52
53	The value for `-n` (the _namespace_) can be changed at will, but care has to be
54	taken to use the same value when verifying the signature.
55




56
57	## Verifying a signature
58
59	Fossil does not provide an internal method for verifying signatures and
60	relies – like it does for signing – on external tools.
61
62	### GnuPG
63
64	Assuming you used the
65	default GPG command for signing, one can verify the signature using
66

	--- www/signing.md
	+++ www/signing.md
	@@ -51,15 +51,19 @@
51	used.
52
53	The value for `-n` (the _namespace_) can be changed at will, but care has to be
54	taken to use the same value when verifying the signature.
55
56	Fossil versions prior to 2.26 do not understand SSH signatures and
57	will treat artifacts signed this way as opaque blobs, not Fossil
58	artifacts.
59
60
61	## Verifying a signature
62
63	Fossil does not provide an internal method for verifying signatures and
64	relies – like it does for signing – on external tools.
65
66	### GnuPG
67
68	Assuming you used the
69	default GPG command for signing, one can verify the signature using
70

M www/sync.wiki

+15 -11

		--- www/sync.wiki
		+++ www/sync.wiki
		@@ -58,20 +58,20 @@
58	58	request.
59	59
60	60	The server might be running as an independent server
61	61	using the [/help?cmd=server\|"fossil server" command], or it
62	62	might be launched from inetd or xinetd using the
63		-["fossil http" command\|/help?cmd=http]. Or the server might
	63	+[/help?cmd=http\|"fossil http" command]. Or the server might
64	64	be [./server/any/cgi.md\|launched from CGI] or from
65	65	[./server/any/scgi.md\|SCGI].
66	66	(See "[./server/\|How To Configure A Fossil Server]" for details.)
67	67	The specifics of how the server listens
68	68	for incoming HTTP requests is immaterial to this protocol.
69	69	The important point is that the server is listening for requests and
70	70	the client is the issuer of the requests.
71	71
72		-A single [/help?cmd=push\|push],
	72	+A single [/help?cmd=push\|push],
73	73	[/help?cmd=pull\|pull], or [/help?cmd=sync\|sync]
74	74	might involve multiple HTTP requests.
75	75	The client maintains state between all requests. But on the server
76	76	side, each request is independent. The server does not preserve
77	77	any information about the client from one request to the next.
		@@ -150,24 +150,24 @@
150	150
151	151	The client modifies the URL by appending the method name "<b>/xfer</b>"
152	152	to the end. For example, if the URL specified on the client command
153	153	line is
154	154
155		-<pre>https://fossil-scm.org/fossil</pre>
	155	+<pre>https://fossil-scm.org/home</pre>
156	156
157	157	Then the URL that is really used to do the synchronization will
158	158	be:
159	159
160		-<pre>https://fossil-scm.org/fossil/xfer</pre>
	160	+<pre>https://fossil-scm.org/home/xfer</pre>
161	161
162	162	<h3 id="req-format">2.2 HTTP Request Format</h3>
163	163
164	164	The client always sends a POST request to the server. The
165	165	general format of the POST request is as follows:
166	166
167	167	<pre>
168		-POST /fossil/xfer HTTP/1.0
	168	+POST /home/xfer HTTP/1.0
169	169	Host: fossil-scm.hwaci.com:80
170	170	Content-Type: application/x-fossil
171	171	Content-Length: 4216
172	172	</pre>
173	173
		@@ -250,11 +250,11 @@
250	250
251	251	<h4 id="ordinary-fc">3.3.1 Ordinary File Cards</h4>
252	252
253	253	For sync protocols, artifacts are transferred using "file"
254	254	cards. File cards come in two different formats depending
255		-on whether the artifact is sent directly or as a
	255	+on whether the artifact is sent directly or as a
256	256	[./delta_format.wiki\|delta] from some
257	257	other artifact.
258	258
259	259	<pre>
260	260	<b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
		@@ -273,11 +273,11 @@
273	273	representation of the name hash for the artifact.
274	274	The last argument of the file card is the number of bytes of
275	275	payload that immediately follow the file card. If the file
276	276	card has only two arguments, that means the payload is the
277	277	complete content of the artifact. If the file card has three
278		-arguments, then the payload is a
	278	+arguments, then the payload is a
279	279	[./delta_format.wiki\|delta] and the second argument is
280	280	the ID of another artifact that is the source of the delta.
281	281
282	282	File cards are sent in both directions: client to server and
283	283	server to client. A delta might be sent before the source of
		@@ -286,12 +286,16 @@
286	286
287	287	<h4 id="compressed-fc">3.3.2 Compressed File Cards</h4>
288	288
289	289	A client that sends a clone protocol version "3" or greater will
290	290	receive artifacts as "cfile" cards while cloning. This card was
291		-introduced to improve the speed of the transfer of content by sending the
292		-compressed artifact directly from the server database to the client.
	291	+introduced to improve the speed of the transfer of content by sending
	292	+the compressed artifact directly from the server database to the
	293	+client. In this case, the containing response body is <em>not</em>
	294	+compressed separately because the vast majority of the response is
	295	+already compressed in cfile cards. In practice, version "3" is
	296	+significantly faster than version "2".
293	297
294	298	Compressed File cards are similar to File cards, sharing the same
295	299	in-line "payload" data characteristics and also the same treatment of
296	300	direct content or delta content. Cfile cards come in two different formats
297	301	depending on whether the artifact is sent directly or as a delta from
		@@ -411,11 +415,11 @@
411	415
412	416	<h4>3.5.2 Protocol 2</h4>
413	417
414	418	The sequence-number sent is the number
415	419	of artifacts received so far. For the first clone message, the
416		-sequence number is 0. The server will respond by sending file
	420	+sequence number is 1. The server will respond by sending file
417	421	cards for some number of artifacts up to the maximum message size.
418	422
419	423	The server will also send a single "clone_seqno" card to the client
420	424	so that the client can know where the server left off.
421	425
		@@ -1038,11 +1042,11 @@
1038	1042	<ul>
1039	1043	<li> <b>login</b> <i>userid nonce signature</i>
1040	1044	<li> <b>push</b> <i>servercode projectcode</i>
1041	1045	<li> <b>pull</b> <i>servercode projectcode</i>
1042	1046	<li> <b>clone</b>
1043		- <li> <b>clone_seqno</b> <i>sequence-number</i>
	1047	+ <li> <b>clone</b> <i>protocol-version sequence-number</i>
1044	1048	<li> <b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
1045	1049	<li> <b>file</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i>
1046	1050	<li> <b>cfile</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
1047	1051	<li> <b>cfile</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i>
1048	1052	<li> <b>uvfile</b> <i>name mtime hash size flags</i> <b>\n</b> <i>content</i>
1049	1053

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -58,20 +58,20 @@
58	request.
59
60	The server might be running as an independent server
61	using the [/help?cmd=server\|"fossil server" command], or it
62	might be launched from inetd or xinetd using the
63	["fossil http" command\|/help?cmd=http]. Or the server might
64	be [./server/any/cgi.md\|launched from CGI] or from
65	[./server/any/scgi.md\|SCGI].
66	(See "[./server/\|How To Configure A Fossil Server]" for details.)
67	The specifics of how the server listens
68	for incoming HTTP requests is immaterial to this protocol.
69	The important point is that the server is listening for requests and
70	the client is the issuer of the requests.
71
72	A single [/help?cmd=push\|push],
73	[/help?cmd=pull\|pull], or [/help?cmd=sync\|sync]
74	might involve multiple HTTP requests.
75	The client maintains state between all requests. But on the server
76	side, each request is independent. The server does not preserve
77	any information about the client from one request to the next.
	@@ -150,24 +150,24 @@
150
151	The client modifies the URL by appending the method name "<b>/xfer</b>"
152	to the end. For example, if the URL specified on the client command
153	line is
154
155	<pre>https://fossil-scm.org/fossil</pre>
156
157	Then the URL that is really used to do the synchronization will
158	be:
159
160	<pre>https://fossil-scm.org/fossil/xfer</pre>
161
162	<h3 id="req-format">2.2 HTTP Request Format</h3>
163
164	The client always sends a POST request to the server. The
165	general format of the POST request is as follows:
166
167	<pre>
168	POST /fossil/xfer HTTP/1.0
169	Host: fossil-scm.hwaci.com:80
170	Content-Type: application/x-fossil
171	Content-Length: 4216
172	</pre>
173
	@@ -250,11 +250,11 @@
250
251	<h4 id="ordinary-fc">3.3.1 Ordinary File Cards</h4>
252
253	For sync protocols, artifacts are transferred using "file"
254	cards. File cards come in two different formats depending
255	on whether the artifact is sent directly or as a
256	[./delta_format.wiki\|delta] from some
257	other artifact.
258
259	<pre>
260	<b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
	@@ -273,11 +273,11 @@
273	representation of the name hash for the artifact.
274	The last argument of the file card is the number of bytes of
275	payload that immediately follow the file card. If the file
276	card has only two arguments, that means the payload is the
277	complete content of the artifact. If the file card has three
278	arguments, then the payload is a
279	[./delta_format.wiki\|delta] and the second argument is
280	the ID of another artifact that is the source of the delta.
281
282	File cards are sent in both directions: client to server and
283	server to client. A delta might be sent before the source of
	@@ -286,12 +286,16 @@
286
287	<h4 id="compressed-fc">3.3.2 Compressed File Cards</h4>
288
289	A client that sends a clone protocol version "3" or greater will
290	receive artifacts as "cfile" cards while cloning. This card was
291	introduced to improve the speed of the transfer of content by sending the
292	compressed artifact directly from the server database to the client.




293
294	Compressed File cards are similar to File cards, sharing the same
295	in-line "payload" data characteristics and also the same treatment of
296	direct content or delta content. Cfile cards come in two different formats
297	depending on whether the artifact is sent directly or as a delta from
	@@ -411,11 +415,11 @@
411
412	<h4>3.5.2 Protocol 2</h4>
413
414	The sequence-number sent is the number
415	of artifacts received so far. For the first clone message, the
416	sequence number is 0. The server will respond by sending file
417	cards for some number of artifacts up to the maximum message size.
418
419	The server will also send a single "clone_seqno" card to the client
420	so that the client can know where the server left off.
421
	@@ -1038,11 +1042,11 @@
1038	<ul>
1039	<li> <b>login</b> <i>userid nonce signature</i>
1040	<li> <b>push</b> <i>servercode projectcode</i>
1041	<li> <b>pull</b> <i>servercode projectcode</i>
1042	<li> <b>clone</b>
1043	<li> <b>clone_seqno</b> <i>sequence-number</i>
1044	<li> <b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
1045	<li> <b>file</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i>
1046	<li> <b>cfile</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
1047	<li> <b>cfile</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i>
1048	<li> <b>uvfile</b> <i>name mtime hash size flags</i> <b>\n</b> <i>content</i>
1049

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -58,20 +58,20 @@
58	request.
59
60	The server might be running as an independent server
61	using the [/help?cmd=server\|"fossil server" command], or it
62	might be launched from inetd or xinetd using the
63	[/help?cmd=http\|"fossil http" command]. Or the server might
64	be [./server/any/cgi.md\|launched from CGI] or from
65	[./server/any/scgi.md\|SCGI].
66	(See "[./server/\|How To Configure A Fossil Server]" for details.)
67	The specifics of how the server listens
68	for incoming HTTP requests is immaterial to this protocol.
69	The important point is that the server is listening for requests and
70	the client is the issuer of the requests.
71
72	A single [/help?cmd=push\|push],
73	[/help?cmd=pull\|pull], or [/help?cmd=sync\|sync]
74	might involve multiple HTTP requests.
75	The client maintains state between all requests. But on the server
76	side, each request is independent. The server does not preserve
77	any information about the client from one request to the next.
	@@ -150,24 +150,24 @@
150
151	The client modifies the URL by appending the method name "<b>/xfer</b>"
152	to the end. For example, if the URL specified on the client command
153	line is
154
155	<pre>https://fossil-scm.org/home</pre>
156
157	Then the URL that is really used to do the synchronization will
158	be:
159
160	<pre>https://fossil-scm.org/home/xfer</pre>
161
162	<h3 id="req-format">2.2 HTTP Request Format</h3>
163
164	The client always sends a POST request to the server. The
165	general format of the POST request is as follows:
166
167	<pre>
168	POST /home/xfer HTTP/1.0
169	Host: fossil-scm.hwaci.com:80
170	Content-Type: application/x-fossil
171	Content-Length: 4216
172	</pre>
173
	@@ -250,11 +250,11 @@
250
251	<h4 id="ordinary-fc">3.3.1 Ordinary File Cards</h4>
252
253	For sync protocols, artifacts are transferred using "file"
254	cards. File cards come in two different formats depending
255	on whether the artifact is sent directly or as a
256	[./delta_format.wiki\|delta] from some
257	other artifact.
258
259	<pre>
260	<b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
	@@ -273,11 +273,11 @@
273	representation of the name hash for the artifact.
274	The last argument of the file card is the number of bytes of
275	payload that immediately follow the file card. If the file
276	card has only two arguments, that means the payload is the
277	complete content of the artifact. If the file card has three
278	arguments, then the payload is a
279	[./delta_format.wiki\|delta] and the second argument is
280	the ID of another artifact that is the source of the delta.
281
282	File cards are sent in both directions: client to server and
283	server to client. A delta might be sent before the source of
	@@ -286,12 +286,16 @@
286
287	<h4 id="compressed-fc">3.3.2 Compressed File Cards</h4>
288
289	A client that sends a clone protocol version "3" or greater will
290	receive artifacts as "cfile" cards while cloning. This card was
291	introduced to improve the speed of the transfer of content by sending
292	the compressed artifact directly from the server database to the
293	client. In this case, the containing response body is <em>not</em>
294	compressed separately because the vast majority of the response is
295	already compressed in cfile cards. In practice, version "3" is
296	significantly faster than version "2".
297
298	Compressed File cards are similar to File cards, sharing the same
299	in-line "payload" data characteristics and also the same treatment of
300	direct content or delta content. Cfile cards come in two different formats
301	depending on whether the artifact is sent directly or as a delta from
	@@ -411,11 +415,11 @@
415
416	<h4>3.5.2 Protocol 2</h4>
417
418	The sequence-number sent is the number
419	of artifacts received so far. For the first clone message, the
420	sequence number is 1. The server will respond by sending file
421	cards for some number of artifacts up to the maximum message size.
422
423	The server will also send a single "clone_seqno" card to the client
424	so that the client can know where the server left off.
425
	@@ -1038,11 +1042,11 @@
1042	<ul>
1043	<li> <b>login</b> <i>userid nonce signature</i>
1044	<li> <b>push</b> <i>servercode projectcode</i>
1045	<li> <b>pull</b> <i>servercode projectcode</i>
1046	<li> <b>clone</b>
1047	<li> <b>clone</b> <i>protocol-version sequence-number</i>
1048	<li> <b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
1049	<li> <b>file</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i>
1050	<li> <b>cfile</b> <i>artifact-id size</i> <b>\n</b> <i>content</i>
1051	<li> <b>cfile</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i>
1052	<li> <b>uvfile</b> <i>name mtime hash size flags</i> <b>\n</b> <i>content</i>
1053

M www/th1.md

+21 -6

		--- www/th1.md
		+++ www/th1.md
		@@ -12,29 +12,43 @@
12	12	time all of the test cases for SQLite were written in Tcl and Tcl could not
13	13	be easily compiled on the SymbianOS. So TH1 was developed as a cut-down
14	14	version of Tcl that would facilitate running the SQLite test scripts on
15	15	SymbianOS.
16	16
17		-Fossil was first being designed at about the same time that TH1 was
18		-being developed for testing SQLite on SymbianOS.
	17	+Fossil was first being designed at about the same time.
19	18	Early prototypes of Fossil were written in pure Tcl. But as the development
20	19	shifted toward the use of C-code, the need arose to have a Tcl-like
21	20	scripting language to help with code generation. TH1 was small and
22	21	light-weight and used minimal resources and seemed ideally suited for the
23	22	task.
24	23
25		-The name "TH1" stands "Test Harness 1", since that was its original purpose.
	24	+The name "TH1" stands for "Test Harness 1",
	25	+since its original purpose was to serve as testing harness
	26	+for SQLite.
26	27
27		-Overview
		---------
	28	+Where TH1 Is Used In Fossil
	29	+---------------------------
	30	+
	31	+ * In the header and footer for [skins](./customskin.md)
	32	+ text within `<th1>...</th1>` is run as a TH1 script.
	33	+ ([example](/builtin/skins/default/header.txt))
	34	+
	35	+ * This display of [tickets](./bugtheory.wiki) is controlled by TH1
	36	+ scripts, so that the ticket format can be customized for each
	37	+ project. Administrators can visit the <b>/tktsetup</b> page in
	38	+ their repositories to view and customize these scripts.
	39	+ ([example usage](./custom_ticket.wiki))
	40	+
	41	+Overview Of The Tcl/TH1 Language
	42	+--------------------------------
28	43
29	44	TH1 is a string-processing language. All values are strings. Any numerical
30	45	operations are accomplished by converting from string to numeric, performing
31	46	the computation, then converting the result back into a string. (This might
32	47	seem inefficient, but it is faster than people imagine, and numeric
33	48	computations do not come up very often for the kinds of work that TH1 does,
34		-so it has never been a factor.)
	49	+so it has never been an issue.)
35	50
36	51	A TH1 script consists of a sequence of commands.
37	52	Each command is terminated by the first unescaped newline or ";" character.
38	53	The text of the command (excluding the newline or semicolon terminator)
39	54	is broken into space-separated tokens. The first token is the command
		@@ -126,11 +140,11 @@
126	140	custom TH1 scripts for headers or footers or tickets are added to a
127	141	repository. Note that the tainted/untainted distinction in strings does
128	142	not make it impossible to introduce XSS and SQL-injections vulnerabilities
129	143	using poorly-written TH1 scripts; it just makes it more difficult and
130	144	less likely to happen by accident. Developers must still consider the
131		-security implications TH1 customizations they add to Fossil, and take
	145	+security implications of TH1 customizations they add to Fossil, and take
132	146	appropriate precautions when writing custom TH1. Peer review of TH1
133	147	script changes is encouraged.
134	148
135	149	In Fossil version 2.26, if the vuln-report setting is set to "block"
136	150	or "fatal", the [html](#html) and [query](#query) TH1 commands will
137	151

	--- www/th1.md
	+++ www/th1.md
	@@ -12,29 +12,43 @@
12	time all of the test cases for SQLite were written in Tcl and Tcl could not
13	be easily compiled on the SymbianOS. So TH1 was developed as a cut-down
14	version of Tcl that would facilitate running the SQLite test scripts on
15	SymbianOS.
16
17	Fossil was first being designed at about the same time that TH1 was
18	being developed for testing SQLite on SymbianOS.
19	Early prototypes of Fossil were written in pure Tcl. But as the development
20	shifted toward the use of C-code, the need arose to have a Tcl-like
21	scripting language to help with code generation. TH1 was small and
22	light-weight and used minimal resources and seemed ideally suited for the
23	task.
24
25	The name "TH1" stands "Test Harness 1", since that was its original purpose.


26
27	Overview
	---------















28
29	TH1 is a string-processing language. All values are strings. Any numerical
30	operations are accomplished by converting from string to numeric, performing
31	the computation, then converting the result back into a string. (This might
32	seem inefficient, but it is faster than people imagine, and numeric
33	computations do not come up very often for the kinds of work that TH1 does,
34	so it has never been a factor.)
35
36	A TH1 script consists of a sequence of commands.
37	Each command is terminated by the first unescaped newline or ";" character.
38	The text of the command (excluding the newline or semicolon terminator)
39	is broken into space-separated tokens. The first token is the command
	@@ -126,11 +140,11 @@
126	custom TH1 scripts for headers or footers or tickets are added to a
127	repository. Note that the tainted/untainted distinction in strings does
128	not make it impossible to introduce XSS and SQL-injections vulnerabilities
129	using poorly-written TH1 scripts; it just makes it more difficult and
130	less likely to happen by accident. Developers must still consider the
131	security implications TH1 customizations they add to Fossil, and take
132	appropriate precautions when writing custom TH1. Peer review of TH1
133	script changes is encouraged.
134
135	In Fossil version 2.26, if the vuln-report setting is set to "block"
136	or "fatal", the [html](#html) and [query](#query) TH1 commands will
137

	--- www/th1.md
	+++ www/th1.md
	@@ -12,29 +12,43 @@
12	time all of the test cases for SQLite were written in Tcl and Tcl could not
13	be easily compiled on the SymbianOS. So TH1 was developed as a cut-down
14	version of Tcl that would facilitate running the SQLite test scripts on
15	SymbianOS.
16
17	Fossil was first being designed at about the same time.

18	Early prototypes of Fossil were written in pure Tcl. But as the development
19	shifted toward the use of C-code, the need arose to have a Tcl-like
20	scripting language to help with code generation. TH1 was small and
21	light-weight and used minimal resources and seemed ideally suited for the
22	task.
23
24	The name "TH1" stands for "Test Harness 1",
25	since its original purpose was to serve as testing harness
26	for SQLite.
27

	---------
28	Where TH1 Is Used In Fossil
29	---------------------------
30
31	* In the header and footer for [skins](./customskin.md)
32	text within `<th1>...</th1>` is run as a TH1 script.
33	([example](/builtin/skins/default/header.txt))
34
35	* This display of [tickets](./bugtheory.wiki) is controlled by TH1
36	scripts, so that the ticket format can be customized for each
37	project. Administrators can visit the <b>/tktsetup</b> page in
38	their repositories to view and customize these scripts.
39	([example usage](./custom_ticket.wiki))
40
41	Overview Of The Tcl/TH1 Language
42	--------------------------------
43
44	TH1 is a string-processing language. All values are strings. Any numerical
45	operations are accomplished by converting from string to numeric, performing
46	the computation, then converting the result back into a string. (This might
47	seem inefficient, but it is faster than people imagine, and numeric
48	computations do not come up very often for the kinds of work that TH1 does,
49	so it has never been an issue.)
50
51	A TH1 script consists of a sequence of commands.
52	Each command is terminated by the first unescaped newline or ";" character.
53	The text of the command (excluding the newline or semicolon terminator)
54	is broken into space-separated tokens. The first token is the command
	@@ -126,11 +140,11 @@
140	custom TH1 scripts for headers or footers or tickets are added to a
141	repository. Note that the tainted/untainted distinction in strings does
142	not make it impossible to introduce XSS and SQL-injections vulnerabilities
143	using poorly-written TH1 scripts; it just makes it more difficult and
144	less likely to happen by accident. Developers must still consider the
145	security implications of TH1 customizations they add to Fossil, and take
146	appropriate precautions when writing custom TH1. Peer review of TH1
147	script changes is encouraged.
148
149	In Fossil version 2.26, if the vuln-report setting is set to "block"
150	or "fatal", the [html](#html) and [query](#query) TH1 commands will
151

Fossil SCM

Keyboard Shortcuts