Fossil SCM

Update the built-in SQLite to version 3.39.2 RC 1.

drh 2022-07-21 14:48 trunk

Commit 8c36dad3ba1110546daf56dfd6ec505d7c0600a35b9d252406af5a06b7423dcc

Parent ff95be00640ff9c…

3 files changed +84 -189 +212 -249 +3 -3

~ extsrc/shell.c ~ extsrc/sqlite3.c ~ extsrc/sqlite3.h

M extsrc/shell.c

+84 -189

		--- extsrc/shell.c
		+++ extsrc/shell.c
		@@ -53,19 +53,10 @@
53	53	*/
54	54	#if !defined(SQLITE_OS_WINRT)
55	55	# define SQLITE_OS_WINRT 0
56	56	#endif
57	57
58		-/*
59		-** If SQLITE_SHELL_FIDDLE is defined then the shell is modified
60		-** somewhat for use as a WASM module in a web browser. This flag
61		-** should only be used when building the "fiddle" web application, as
62		-** the browser-mode build has much different user input requirements
63		-** and this build mode rewires the user input subsystem to account for
64		-** that.
65		-*/
66		-
67	58	/*
68	59	** Warning pragmas copied from msvc.h in the core.
69	60	*/
70	61	#if defined(_MSC_VER)
71	62	#pragma warning(disable : 4054)
		@@ -254,10 +245,21 @@
254	245	#else
255	246	# define setBinaryMode(X,Y)
256	247	# define setTextMode(X,Y)
257	248	#endif
258	249
	250	+/*
	251	+** When compiling with emcc (a.k.a. emscripten), we're building a
	252	+** WebAssembly (WASM) bundle and need to disable and rewire a few
	253	+** things.
	254	+*/
	255	+#ifdef __EMSCRIPTEN__
	256	+#define SQLITE_SHELL_WASM_MODE
	257	+#else
	258	+#undef SQLITE_SHELL_WASM_MODE
	259	+#endif
	260	+
259	261	/* True if the timer is enabled */
260	262	static int enableTimer = 0;
261	263
262	264	/* Return the current wall-clock time */
263	265	static sqlite3_int64 timeOfDay(void){
		@@ -715,11 +717,11 @@
715	717	**
716	718	** The result is stored in space obtained from malloc() and must either
717	719	** be freed by the caller or else passed back into this routine via the
718	720	** zPrior argument for reuse.
719	721	*/
720		-#ifndef SQLITE_SHELL_FIDDLE
	722	+#ifndef SQLITE_SHELL_WASM_MODE
721	723	static char one_input_line(FILE in, char *zPrior, int isContinuation){
722	724	char *zPrompt;
723	725	char *zResult;
724	726	if( in!=0 ){
725	727	zResult = local_getline(zPrior, in);
		@@ -735,11 +737,11 @@
735	737	if( zResult && *zResult ) shell_add_history(zResult);
736	738	#endif
737	739	}
738	740	return zResult;
739	741	}
740		-#endif /* !SQLITE_SHELL_FIDDLE */
	742	+#endif /* !SQLITE_SHELL_WASM_MODE */
741	743
742	744	/*
743	745	** Return the value of a hexadecimal digit. Return -1 if the input
744	746	** is not a hex digit.
745	747	*/
		@@ -3792,11 +3794,10 @@
3792	3794	#define re_compile sqlite3re_compile
3793	3795	#define re_free sqlite3re_free
3794	3796
3795	3797	/* The end-of-input character */
3796	3798	#define RE_EOF 0 /* End of input */
3797		-#define RE_START 0xfffffff /* Start of input - larger than an UTF-8 */
3798	3799
3799	3800	/* The NFA is implemented as sequence of opcodes taken from the following
3800	3801	** set. Each opcode has a single integer argument.
3801	3802	*/
3802	3803	#define RE_OP_MATCH 1 /* Match the one character in the argument */
		@@ -3814,37 +3815,10 @@
3814	3815	#define RE_OP_DIGIT 13 /* digit: [0-9] */
3815	3816	#define RE_OP_NOTDIGIT 14 /* Not a digit */
3816	3817	#define RE_OP_SPACE 15 /* space: [ \t\n\r\v\f] */
3817	3818	#define RE_OP_NOTSPACE 16 /* Not a digit */
3818	3819	#define RE_OP_BOUNDARY 17 /* Boundary between word and non-word */
3819		-#define RE_OP_ATSTART 18 /* Currently at the start of the string */
3820		-
3821		-#if defined(SQLITE_DEBUG)
3822		-/* Opcode names used for symbolic debugging */
3823		-static const char *ReOpName[] = {
3824		- "EOF",
3825		- "MATCH",
3826		- "ANY",
3827		- "ANYSTAR",
3828		- "FORK",
3829		- "GOTO",
3830		- "ACCEPT",
3831		- "CC_INC",
3832		- "CC_EXC",
3833		- "CC_VALUE",
3834		- "CC_RANGE",
3835		- "WORD",
3836		- "NOTWORD",
3837		- "DIGIT",
3838		- "NOTDIGIT",
3839		- "SPACE",
3840		- "NOTSPACE",
3841		- "BOUNDARY",
3842		- "ATSTART",
3843		-};
3844		-#endif /* SQLITE_DEBUG */
3845		-
3846	3820
3847	3821	/* Each opcode is a "state" in the NFA */
3848	3822	typedef unsigned short ReStateNumber;
3849	3823
3850	3824	/* Because this is an NFA and not a DFA, multiple states can be active at
		@@ -3875,11 +3849,11 @@
3875	3849	const char zErr; / Error message to return */
3876	3850	char aOp; / Operators for the virtual machine */
3877	3851	int aArg; / Arguments to each operator */
3878	3852	unsigned (xNextChar)(ReInput); /* Next character function */
3879	3853	unsigned char zInit[12]; /* Initial text to match */
3880		- int nInit; /* Number of bytes in zInit */
	3854	+ int nInit; /* Number of characters in zInit */
3881	3855	unsigned nState; /* Number of entries in aOp[] and aArg[] */
3882	3856	unsigned nAlloc; /* Slots allocated for aOp[] and aArg[] */
3883	3857	};
3884	3858
3885	3859	/* Add a state to the given state set if it is not already there */
		@@ -3948,11 +3922,11 @@
3948	3922	ReStateSet aStateSet[2], pThis, pNext;
3949	3923	ReStateNumber aSpace[100];
3950	3924	ReStateNumber *pToFree;
3951	3925	unsigned int i = 0;
3952	3926	unsigned int iSwap = 0;
3953		- int c = RE_START;
	3927	+ int c = RE_EOF+1;
3954	3928	int cPrev = 0;
3955	3929	int rc = 0;
3956	3930	ReInput in;
3957	3931
3958	3932	in.z = zIn;
		@@ -3967,11 +3941,10 @@
3967	3941	strncmp((const char)zIn+in.i, (const char)pRe->zInit, pRe->nInit)!=0)
3968	3942	){
3969	3943	in.i++;
3970	3944	}
3971	3945	if( in.i+pRe->nInit>in.mx ) return 0;
3972		- c = RE_START-1;
3973	3946	}
3974	3947
3975	3948	if( pRe->nState<=(sizeof(aSpace)/(sizeof(aSpace[0])*2)) ){
3976	3949	pToFree = 0;
3977	3950	aStateSet[0].aState = aSpace;
		@@ -3996,14 +3969,10 @@
3996	3969	switch( pRe->aOp[x] ){
3997	3970	case RE_OP_MATCH: {
3998	3971	if( pRe->aArg[x]==c ) re_add_state(pNext, x+1);
3999	3972	break;
4000	3973	}
4001		- case RE_OP_ATSTART: {
4002		- if( cPrev==RE_START ) re_add_state(pThis, x+1);
4003		- break;
4004		- }
4005	3974	case RE_OP_ANY: {
4006	3975	if( c!=0 ) re_add_state(pNext, x+1);
4007	3976	break;
4008	3977	}
4009	3978	case RE_OP_WORD: {
		@@ -4081,13 +4050,11 @@
4081	4050	}
4082	4051	}
4083	4052	}
4084	4053	}
4085	4054	for(i=0; i<pNext->nState; i++){
4086		- int x = pNext->aState[i];
4087		- while( pRe->aOp[x]==RE_OP_GOTO ) x += pRe->aArg[x];
4088		- if( pRe->aOp[x]==RE_OP_ACCEPT ){ rc = 1; break; }
	4055	+ if( pRe->aOp[pNext->aState[i]]==RE_OP_ACCEPT ){ rc = 1; break; }
4089	4056	}
4090	4057	re_match_end:
4091	4058	sqlite3_free(pToFree);
4092	4059	return rc;
4093	4060	}
		@@ -4238,10 +4205,11 @@
4238	4205	const char *zErr;
4239	4206	while( (c = p->xNextChar(&p->sIn))!=0 ){
4240	4207	iStart = p->nState;
4241	4208	switch( c ){
4242	4209	case '\|':
	4210	+ case '$':
4243	4211	case ')': {
4244	4212	p->sIn.i--;
4245	4213	return 0;
4246	4214	}
4247	4215	case '(': {
		@@ -4274,18 +4242,10 @@
4274	4242	case '?': {
4275	4243	if( iPrev<0 ) return "'?' without operand";
4276	4244	re_insert(p, iPrev, RE_OP_FORK, p->nState - iPrev+1);
4277	4245	break;
4278	4246	}
4279		- case '$': {
4280		- re_append(p, RE_OP_MATCH, RE_EOF);
4281		- break;
4282		- }
4283		- case '^': {
4284		- re_append(p, RE_OP_ATSTART, 0);
4285		- break;
4286		- }
4287	4247	case '{': {
4288	4248	int m = 0, n = 0;
4289	4249	int sz, j;
4290	4250	if( iPrev<0 ) return "'{m,n}' without operand";
4291	4251	while( (c=rePeek(p))>='0' && c<='9' ){ m = m*10 + c - '0'; p->sIn.i++; }
		@@ -4300,11 +4260,10 @@
4300	4260	p->sIn.i++;
4301	4261	sz = p->nState - iPrev;
4302	4262	if( m==0 ){
4303	4263	if( n==0 ) return "both m and n are zero in '{m,n}'";
4304	4264	re_insert(p, iPrev, RE_OP_FORK, sz+1);
4305		- iPrev++;
4306	4265	n--;
4307	4266	}else{
4308	4267	for(j=1; j<m; j++) re_copy(p, iPrev, sz);
4309	4268	}
4310	4269	for(j=m; j<n; j++){
		@@ -4419,11 +4378,15 @@
4419	4378	zErr = re_subcompile_re(pRe);
4420	4379	if( zErr ){
4421	4380	re_free(pRe);
4422	4381	return zErr;
4423	4382	}
4424		- if( pRe->sIn.i>=pRe->sIn.mx ){
	4383	+ if( rePeek(pRe)=='$' && pRe->sIn.i+1>=pRe->sIn.mx ){
	4384	+ re_append(pRe, RE_OP_MATCH, RE_EOF);
	4385	+ re_append(pRe, RE_OP_ACCEPT, 0);
	4386	+ *ppRe = pRe;
	4387	+ }else if( pRe->sIn.i>=pRe->sIn.mx ){
4425	4388	re_append(pRe, RE_OP_ACCEPT, 0);
4426	4389	*ppRe = pRe;
4427	4390	}else{
4428	4391	re_free(pRe);
4429	4392	return "unrecognized character";
		@@ -4502,71 +4465,10 @@
4502	4465	}
4503	4466	if( setAux ){
4504	4467	sqlite3_set_auxdata(context, 0, pRe, (void()(void))re_free);
4505	4468	}
4506	4469	}
4507		-
4508		-#if defined(SQLITE_DEBUG)
4509		-/*
4510		-** This function is used for testing and debugging only. It is only available
4511		-** if the SQLITE_DEBUG compile-time option is used.
4512		-**
4513		-** Compile a regular expression and then convert the compiled expression into
4514		-** text and return that text.
4515		-*/
4516		-static void re_bytecode_func(
4517		- sqlite3_context *context,
4518		- int argc,
4519		- sqlite3_value **argv
4520		-){
4521		- const char *zPattern;
4522		- const char *zErr;
4523		- ReCompiled *pRe;
4524		- sqlite3_str *pStr;
4525		- int i;
4526		- int n;
4527		- char *z;
4528		-
4529		- zPattern = (const char*)sqlite3_value_text(argv[0]);
4530		- if( zPattern==0 ) return;
4531		- zErr = re_compile(&pRe, zPattern, sqlite3_user_data(context)!=0);
4532		- if( zErr ){
4533		- re_free(pRe);
4534		- sqlite3_result_error(context, zErr, -1);
4535		- return;
4536		- }
4537		- if( pRe==0 ){
4538		- sqlite3_result_error_nomem(context);
4539		- return;
4540		- }
4541		- pStr = sqlite3_str_new(0);
4542		- if( pStr==0 ) goto re_bytecode_func_err;
4543		- if( pRe->nInit>0 ){
4544		- sqlite3_str_appendf(pStr, "INIT ");
4545		- for(i=0; i<pRe->nInit; i++){
4546		- sqlite3_str_appendf(pStr, "%02x", pRe->zInit[i]);
4547		- }
4548		- sqlite3_str_appendf(pStr, "\n");
4549		- }
4550		- for(i=0; i<pRe->nState; i++){
4551		- sqlite3_str_appendf(pStr, "%-8s %4d\n",
4552		- ReOpName[(unsigned char)pRe->aOp[i]], pRe->aArg[i]);
4553		- }
4554		- n = sqlite3_str_length(pStr);
4555		- z = sqlite3_str_finish(pStr);
4556		- if( n==0 ){
4557		- sqlite3_free(z);
4558		- }else{
4559		- sqlite3_result_text(context, z, n-1, sqlite3_free);
4560		- }
4561		-
4562		-re_bytecode_func_err:
4563		- re_free(pRe);
4564		-}
4565		-
4566		-#endif /* SQLITE_DEBUG */
4567		-
4568	4470
4569	4471	/*
4570	4472	** Invoke this routine to register the regexp() function with the
4571	4473	** SQLite database connection.
4572	4474	*/
		@@ -4588,23 +4490,16 @@
4588	4490	/* The regexpi(PATTERN,STRING) function is a case-insensitive version
4589	4491	** of regexp(PATTERN,STRING). */
4590	4492	rc = sqlite3_create_function(db, "regexpi", 2,
4591	4493	SQLITE_UTF8\|SQLITE_INNOCUOUS\|SQLITE_DETERMINISTIC,
4592	4494	(void*)db, re_sql_func, 0, 0);
4593		-#if defined(SQLITE_DEBUG)
4594		- if( rc==SQLITE_OK ){
4595		- rc = sqlite3_create_function(db, "regexp_bytecode", 1,
4596		- SQLITE_UTF8\|SQLITE_INNOCUOUS\|SQLITE_DETERMINISTIC,
4597		- 0, re_bytecode_func, 0, 0);
4598		- }
4599		-#endif /* SQLITE_DEBUG */
4600	4495	}
4601	4496	return rc;
4602	4497	}
4603	4498
4604	4499	/*********************** End ../ext/misc/regexp.c ******************/
4605		-#ifndef SQLITE_SHELL_FIDDLE
	4500	+#ifndef SQLITE_SHELL_WASM_MODE
4606	4501	/*********************** Begin ../ext/misc/fileio.c ****************/
4607	4502	/*
4608	4503	** 2014-06-13
4609	4504	**
4610	4505	** The author disclaims copyright to this source code. In place of
		@@ -12353,19 +12248,19 @@
12353	12248	int nIndent; /* Size of array aiIndent[] */
12354	12249	int iIndent; /* Index of current op in aiIndent[] */
12355	12250	char zNonce; / Nonce for temporary safe-mode excapes */
12356	12251	EQPGraph sGraph; /* Information for the graphical EXPLAIN QUERY PLAN */
12357	12252	ExpertInfo expert; /* Valid if previous command was ".expert OPT..." */
12358		-#ifdef SQLITE_SHELL_FIDDLE
	12253	+#ifdef SQLITE_SHELL_WASM_MODE
12359	12254	struct {
12360	12255	const char * zInput; /* Input string from wasm/JS proxy */
12361	12256	const char * zPos; /* Cursor pos into zInput */
12362	12257	} wasm;
12363	12258	#endif
12364	12259	};
12365	12260
12366		-#ifdef SQLITE_SHELL_FIDDLE
	12261	+#ifdef SQLITE_SHELL_WASM_MODE
12367	12262	static ShellState shellState;
12368	12263	#endif
12369	12264
12370	12265
12371	12266	/* Allowed values for ShellState.autoEQP
		@@ -13029,11 +12924,11 @@
13029	12924	UNUSED_PARAMETER(zA2);
13030	12925	UNUSED_PARAMETER(zA3);
13031	12926	UNUSED_PARAMETER(zA4);
13032	12927	switch( op ){
13033	12928	case SQLITE_ATTACH: {
13034		-#ifndef SQLITE_SHELL_FIDDLE
	12929	+#ifndef SQLITE_SHELL_WASM_MODE
13035	12930	/* In WASM builds the filesystem is a virtual sandbox, so
13036	12931	** there's no harm in using ATTACH. */
13037	12932	failIfSafeMode(p, "cannot run ATTACH in safe mode");
13038	12933	#endif
13039	12934	break;
		@@ -15443,11 +15338,11 @@
15443	15338	** There must be two or more spaces between the end of the command and the
15444	15339	** start of the description of what that command does.
15445	15340	*/
15446	15341	static const char *(azHelp[]) = {
15447	15342	#if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE) \
15448		- && !defined(SQLITE_SHELL_FIDDLE)
	15343	+ && !defined(SQLITE_SHELL_WASM_MODE)
15449	15344	".archive ... Manage SQL archives",
15450	15345	" Each command must have exactly one of the following options:",
15451	15346	" -c, --create Create a new archive",
15452	15347	" -u, --update Add or update files with changed mtime",
15453	15348	" -i, --insert Like -u but always add even if unchanged",
		@@ -15469,23 +15364,23 @@
15469	15364	" http://sqlite.org/cli.html#sqlite_archive_support",
15470	15365	#endif
15471	15366	#ifndef SQLITE_OMIT_AUTHORIZATION
15472	15367	".auth ON\|OFF Show authorizer callbacks",
15473	15368	#endif
15474		-#ifndef SQLITE_SHELL_FIDDLE
	15369	+#ifndef SQLITE_SHELL_WASM_MODE
15475	15370	".backup ?DB? FILE Backup DB (default \"main\") to FILE",
15476	15371	" Options:",
15477	15372	" --append Use the appendvfs",
15478	15373	" --async Write to FILE without journal and fsync()",
15479	15374	#endif
15480	15375	".bail on\|off Stop after hitting an error. Default OFF",
15481	15376	".binary on\|off Turn binary output on or off. Default OFF",
15482		-#ifndef SQLITE_SHELL_FIDDLE
	15377	+#ifndef SQLITE_SHELL_WASM_MODE
15483	15378	".cd DIRECTORY Change the working directory to DIRECTORY",
15484	15379	#endif
15485	15380	".changes on\|off Show number of rows changed by SQL",
15486		-#ifndef SQLITE_SHELL_FIDDLE
	15381	+#ifndef SQLITE_SHELL_WASM_MODE
15487	15382	".check GLOB Fail if output since .testcase does not match",
15488	15383	".clone NEWDB Clone data into NEWDB from the existing database",
15489	15384	#endif
15490	15385	".connection [close] [#] Open or close an auxiliary database connection",
15491	15386	".databases List names and files of attached databases",
		@@ -15507,15 +15402,15 @@
15507	15402	#ifdef SQLITE_DEBUG
15508	15403	" test Show raw EXPLAIN QUERY PLAN output",
15509	15404	" trace Like \"full\" but enable \"PRAGMA vdbe_trace\"",
15510	15405	#endif
15511	15406	" trigger Like \"full\" but also show trigger bytecode",
15512		-#ifndef SQLITE_SHELL_FIDDLE
	15407	+#ifndef SQLITE_SHELL_WASM_MODE
15513	15408	".excel Display the output of next command in spreadsheet",
15514	15409	" --bom Put a UTF8 byte-order mark on intermediate file",
15515	15410	#endif
15516		-#ifndef SQLITE_SHELL_FIDDLE
	15411	+#ifndef SQLITE_SHELL_WASM_MODE
15517	15412	".exit ?CODE? Exit this program with return-code CODE",
15518	15413	#endif
15519	15414	".expert EXPERIMENTAL. Suggest indexes for queries",
15520	15415	".explain ?on\|off\|auto? Change the EXPLAIN formatting mode. Default: auto",
15521	15416	".filectrl CMD ... Run various sqlite3_file_control() operations",
		@@ -15522,11 +15417,11 @@
15522	15417	" --schema SCHEMA Use SCHEMA instead of \"main\"",
15523	15418	" --help Show CMD details",
15524	15419	".fullschema ?--indent? Show schema and the content of sqlite_stat tables",
15525	15420	".headers on\|off Turn display of headers on or off",
15526	15421	".help ?-all? ?PATTERN? Show help text for PATTERN",
15527		-#ifndef SQLITE_SHELL_FIDDLE
	15422	+#ifndef SQLITE_SHELL_WASM_MODE
15528	15423	".import FILE TABLE Import data from FILE into TABLE",
15529	15424	" Options:",
15530	15425	" --ascii Use \\037 and \\036 as column and row separators",
15531	15426	" --csv Use , and \\n as column and row separators",
15532	15427	" --skip N Skip the first N rows of input",
		@@ -15551,14 +15446,14 @@
15551	15446	#endif
15552	15447	".limit ?LIMIT? ?VAL? Display or change the value of an SQLITE_LIMIT",
15553	15448	".lint OPTIONS Report potential schema issues.",
15554	15449	" Options:",
15555	15450	" fkey-indexes Find missing foreign key indexes",
15556		-#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
	15451	+#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_WASM_MODE)
15557	15452	".load FILE ?ENTRY? Load an extension library",
15558	15453	#endif
15559		-#ifndef SQLITE_SHELL_FIDDLE
	15454	+#ifndef SQLITE_SHELL_WASM_MODE
15560	15455	".log FILE\|off Turn logging on or off. FILE can be stderr/stdout",
15561	15456	#endif
15562	15457	".mode MODE ?OPTIONS? Set output mode",
15563	15458	" MODE is one of:",
15564	15459	" ascii Columns/rows delimited by 0x1F and 0x1E",
		@@ -15581,15 +15476,15 @@
15581	15476	" --wordwrap B Wrap or not at word boundaries per B (on/off)",
15582	15477	" --ww Shorthand for \"--wordwrap 1\"",
15583	15478	" --quote Quote output text as SQL literals",
15584	15479	" --noquote Do not quote output text",
15585	15480	" TABLE The name of SQL table used for \"insert\" mode",
15586		-#ifndef SQLITE_SHELL_FIDDLE
	15481	+#ifndef SQLITE_SHELL_WASM_MODE
15587	15482	".nonce STRING Suspend safe mode for one command if nonce matches",
15588	15483	#endif
15589	15484	".nullvalue STRING Use STRING in place of NULL values",
15590		-#ifndef SQLITE_SHELL_FIDDLE
	15485	+#ifndef SQLITE_SHELL_WASM_MODE
15591	15486	".once ?OPTIONS? ?FILE? Output for the next SQL command only to FILE",
15592	15487	" If FILE begins with '\|' then open as a pipe",
15593	15488	" --bom Put a UTF8 byte-order mark at the beginning",
15594	15489	" -e Send output to the system text editor",
15595	15490	" -x Send output as CSV to a spreadsheet (same as \".excel\")",
		@@ -15607,11 +15502,11 @@
15607	15502	#endif
15608	15503	" --new Initialize FILE to an empty database",
15609	15504	" --nofollow Do not follow symbolic links",
15610	15505	" --readonly Open FILE readonly",
15611	15506	" --zip FILE is a ZIP archive",
15612		-#ifndef SQLITE_SHELL_FIDDLE
	15507	+#ifndef SQLITE_SHELL_WASM_MODE
15613	15508	".output ?FILE? Send output to FILE or stdout if FILE is omitted",
15614	15509	" If FILE begins with '\|' then open it as a pipe.",
15615	15510	" Options:",
15616	15511	" --bom Prefix output with a UTF8 byte-order mark",
15617	15512	" -e Send output to the system text editor",
		@@ -15631,11 +15526,11 @@
15631	15526	" --once Do no more than one progress interrupt",
15632	15527	" --quiet\|-q No output except at interrupts",
15633	15528	" --reset Reset the count for each input and interrupt",
15634	15529	#endif
15635	15530	".prompt MAIN CONTINUE Replace the standard prompts",
15636		-#ifndef SQLITE_SHELL_FIDDLE
	15531	+#ifndef SQLITE_SHELL_WASM_MODE
15637	15532	".quit Exit this program",
15638	15533	".read FILE Read input from FILE or command output",
15639	15534	" If FILE begins with \"\|\", it is a command that generates the input.",
15640	15535	#endif
15641	15536	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
		@@ -15644,11 +15539,11 @@
15644	15539	" --recovery-db NAME Store recovery metadata in database file NAME",
15645	15540	" --lost-and-found TABLE Alternative name for the lost-and-found table",
15646	15541	" --no-rowids Do not attempt to recover rowid values",
15647	15542	" that are not also INTEGER PRIMARY KEYs",
15648	15543	#endif
15649		-#ifndef SQLITE_SHELL_FIDDLE
	15544	+#ifndef SQLITE_SHELL_WASM_MODE
15650	15545	".restore ?DB? FILE Restore content of DB (default \"main\") from FILE",
15651	15546	".save ?OPTIONS? FILE Write database to FILE (an alias for .backup ...)",
15652	15547	#endif
15653	15548	".scanstats on\|off Turn sqlite3_stmt_scanstatus() metrics on or off",
15654	15549	".schema ?PATTERN? Show the CREATE statements matching PATTERN",
		@@ -15681,24 +15576,24 @@
15681	15576	" --sha3-224 Use the sha3-224 algorithm",
15682	15577	" --sha3-256 Use the sha3-256 algorithm (default)",
15683	15578	" --sha3-384 Use the sha3-384 algorithm",
15684	15579	" --sha3-512 Use the sha3-512 algorithm",
15685	15580	" Any other argument is a LIKE pattern for tables to hash",
15686		-#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
	15581	+#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
15687	15582	".shell CMD ARGS... Run CMD ARGS... in a system shell",
15688	15583	#endif
15689	15584	".show Show the current values for various settings",
15690	15585	".stats ?ARG? Show stats or turn stats on or off",
15691	15586	" off Turn off automatic stat display",
15692	15587	" on Turn on automatic stat display",
15693	15588	" stmt Show statement stats",
15694	15589	" vmstep Show the virtual machine step count only",
15695		-#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
	15590	+#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
15696	15591	".system CMD ARGS... Run CMD ARGS... in a system shell",
15697	15592	#endif
15698	15593	".tables ?TABLE? List names of tables matching LIKE pattern TABLE",
15699		-#ifndef SQLITE_SHELL_FIDDLE
	15594	+#ifndef SQLITE_SHELL_WASM_MODE
15700	15595	".testcase NAME Begin redirecting output to 'testcase-out.txt'",
15701	15596	#endif
15702	15597	".testctrl CMD ... Run various sqlite3_test_control() operations",
15703	15598	" Run \".testctrl\" with no arguments for details",
15704	15599	".timeout MS Try opening locked tables for MS milliseconds",
		@@ -16247,11 +16142,11 @@
16247	16142	sqlite3_uint_init(p->db, 0, 0);
16248	16143	sqlite3_decimal_init(p->db, 0, 0);
16249	16144	sqlite3_regexp_init(p->db, 0, 0);
16250	16145	sqlite3_ieee_init(p->db, 0, 0);
16251	16146	sqlite3_series_init(p->db, 0, 0);
16252		-#ifndef SQLITE_SHELL_FIDDLE
	16147	+#ifndef SQLITE_SHELL_WASM_MODE
16253	16148	sqlite3_fileio_init(p->db, 0, 0);
16254	16149	sqlite3_completion_init(p->db, 0, 0);
16255	16150	#endif
16256	16151	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
16257	16152	sqlite3_dbdata_init(p->db, 0, 0);
		@@ -19377,19 +19272,19 @@
19377	19272	}
19378	19273	}else
19379	19274	#endif
19380	19275
19381	19276	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) \
19382		- && !defined(SQLITE_SHELL_FIDDLE)
	19277	+ && !defined(SQLITE_SHELL_WASM_MODE)
19383	19278	if( c=='a' && strncmp(azArg[0], "archive", n)==0 ){
19384	19279	open_db(p, 0);
19385	19280	failIfSafeMode(p, "cannot run .archive in safe mode");
19386	19281	rc = arDotCommand(p, 0, azArg, nArg);
19387	19282	}else
19388	19283	#endif
19389	19284
19390		-#ifndef SQLITE_SHELL_FIDDLE
	19285	+#ifndef SQLITE_SHELL_WASM_MODE
19391	19286	if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
19392	19287	\|\| (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
19393	19288	){
19394	19289	const char *zDestFile = 0;
19395	19290	const char *zDb = 0;
		@@ -19454,11 +19349,11 @@
19454	19349	utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
19455	19350	rc = 1;
19456	19351	}
19457	19352	close_db(pDest);
19458	19353	}else
19459		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	19354	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19460	19355
19461	19356	if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
19462	19357	if( nArg==2 ){
19463	19358	bail_on_error = booleanValue(azArg[1]);
19464	19359	}else{
		@@ -19485,11 +19380,11 @@
19485	19380	*/
19486	19381	if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
19487	19382	test_breakpoint();
19488	19383	}else
19489	19384
19490		-#ifndef SQLITE_SHELL_FIDDLE
	19385	+#ifndef SQLITE_SHELL_WASM_MODE
19491	19386	if( c=='c' && strcmp(azArg[0],"cd")==0 ){
19492	19387	failIfSafeMode(p, "cannot run .cd in safe mode");
19493	19388	if( nArg==2 ){
19494	19389	#if defined(_WIN32) \|\| defined(WIN32)
19495	19390	wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
		@@ -19505,11 +19400,11 @@
19505	19400	}else{
19506	19401	raw_printf(stderr, "Usage: .cd DIRECTORY\n");
19507	19402	rc = 1;
19508	19403	}
19509	19404	}else
19510		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	19405	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19511	19406
19512	19407	if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
19513	19408	if( nArg==2 ){
19514	19409	setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
19515	19410	}else{
		@@ -19516,11 +19411,11 @@
19516	19411	raw_printf(stderr, "Usage: .changes on\|off\n");
19517	19412	rc = 1;
19518	19413	}
19519	19414	}else
19520	19415
19521		-#ifndef SQLITE_SHELL_FIDDLE
	19416	+#ifndef SQLITE_SHELL_WASM_MODE
19522	19417	/* Cancel output redirection, if it is currently set (by .testcase)
19523	19418	** Then read the content of the testcase-out.txt file and compare against
19524	19419	** azArg[1]. If there are differences, report an error and exit.
19525	19420	*/
19526	19421	if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
		@@ -19541,23 +19436,23 @@
19541	19436	utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
19542	19437	p->nCheck++;
19543	19438	}
19544	19439	sqlite3_free(zRes);
19545	19440	}else
19546		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	19441	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19547	19442
19548		-#ifndef SQLITE_SHELL_FIDDLE
	19443	+#ifndef SQLITE_SHELL_WASM_MODE
19549	19444	if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
19550	19445	failIfSafeMode(p, "cannot run .clone in safe mode");
19551	19446	if( nArg==2 ){
19552	19447	tryToClone(p, azArg[1]);
19553	19448	}else{
19554	19449	raw_printf(stderr, "Usage: .clone FILENAME\n");
19555	19450	rc = 1;
19556	19451	}
19557	19452	}else
19558		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	19453	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19559	19454
19560	19455	if( c=='c' && strncmp(azArg[0], "connection", n)==0 ){
19561	19456	if( nArg==1 ){
19562	19457	/* List available connections */
19563	19458	int i;
		@@ -19842,11 +19737,11 @@
19842	19737	raw_printf(stderr, "Usage: .eqp off\|on\|trace\|trigger\|full\n");
19843	19738	rc = 1;
19844	19739	}
19845	19740	}else
19846	19741
19847		-#ifndef SQLITE_SHELL_FIDDLE
	19742	+#ifndef SQLITE_SHELL_WASM_MODE
19848	19743	if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
19849	19744	if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
19850	19745	rc = 2;
19851	19746	}else
19852	19747	#endif
		@@ -20102,11 +19997,11 @@
20102	19997	}else{
20103	19998	showHelp(p->out, 0);
20104	19999	}
20105	20000	}else
20106	20001
20107		-#ifndef SQLITE_SHELL_FIDDLE
	20002	+#ifndef SQLITE_SHELL_WASM_MODE
20108	20003	if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
20109	20004	char zTable = 0; / Insert data into this table */
20110	20005	char zSchema = 0; / within this schema (may default to "main") */
20111	20006	char zFile = 0; / Name of file to extra content from */
20112	20007	sqlite3_stmt pStmt = NULL; / A statement */
		@@ -20393,11 +20288,11 @@
20393	20288	utf8_printf(p->out,
20394	20289	"Added %d rows with %d errors using %d lines of input\n",
20395	20290	sCtx.nRow, sCtx.nErr, sCtx.nLine-1);
20396	20291	}
20397	20292	}else
20398		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	20293	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
20399	20294
20400	20295	#ifndef SQLITE_UNTESTABLE
20401	20296	if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
20402	20297	char *zSql;
20403	20298	char *zCollist = 0;
		@@ -20583,11 +20478,11 @@
20583	20478	if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
20584	20479	open_db(p, 0);
20585	20480	lintDotCommand(p, azArg, nArg);
20586	20481	}else
20587	20482
20588		-#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
	20483	+#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_WASM_MODE)
20589	20484	if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
20590	20485	const char zFile, zProc;
20591	20486	char *zErrMsg = 0;
20592	20487	failIfSafeMode(p, "cannot run .load in safe mode");
20593	20488	if( nArg<2 ){
		@@ -20605,11 +20500,11 @@
20605	20500	rc = 1;
20606	20501	}
20607	20502	}else
20608	20503	#endif
20609	20504
20610		-#ifndef SQLITE_SHELL_FIDDLE
	20505	+#ifndef SQLITE_SHELL_WASM_MODE
20611	20506	if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
20612	20507	failIfSafeMode(p, "cannot run .log in safe mode");
20613	20508	if( nArg!=2 ){
20614	20509	raw_printf(stderr, "Usage: .log FILENAME\n");
20615	20510	rc = 1;
		@@ -20742,11 +20637,11 @@
20742	20637	rc = 1;
20743	20638	}
20744	20639	p->cMode = p->mode;
20745	20640	}else
20746	20641
20747		-#ifndef SQLITE_SHELL_FIDDLE
	20642	+#ifndef SQLITE_SHELL_WASM_MODE
20748	20643	if( c=='n' && strcmp(azArg[0], "nonce")==0 ){
20749	20644	if( nArg!=2 ){
20750	20645	raw_printf(stderr, "Usage: .nonce NONCE\n");
20751	20646	rc = 1;
20752	20647	}else if( p->zNonce==0 \|\| strcmp(azArg[1],p->zNonce)!=0 ){
		@@ -20757,11 +20652,11 @@
20757	20652	p->bSafeMode = 0;
20758	20653	return 0; /* Return immediately to bypass the safe mode reset
20759	20654	** at the end of this procedure */
20760	20655	}
20761	20656	}else
20762		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	20657	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
20763	20658
20764	20659	if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
20765	20660	if( nArg==2 ){
20766	20661	sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
20767	20662	"%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
		@@ -20779,11 +20674,11 @@
20779	20674	int openMode = SHELL_OPEN_UNSPEC;
20780	20675
20781	20676	/* Check for command-line arguments */
20782	20677	for(iName=1; iName<nArg; iName++){
20783	20678	const char *z = azArg[iName];
20784		-#ifndef SQLITE_SHELL_FIDDLE
	20679	+#ifndef SQLITE_SHELL_WASM_MODE
20785	20680	if( optionMatch(z,"new") ){
20786	20681	newFlag = 1;
20787	20682	#ifdef SQLITE_HAVE_ZLIB
20788	20683	}else if( optionMatch(z, "zip") ){
20789	20684	openMode = SHELL_OPEN_ZIPFILE;
		@@ -20801,11 +20696,11 @@
20801	20696	openMode = SHELL_OPEN_HEXDB;
20802	20697	}else if( optionMatch(z, "maxsize") && iName+1<nArg ){
20803	20698	p->szMax = integerValue(azArg[++iName]);
20804	20699	#endif /* SQLITE_OMIT_DESERIALIZE */
20805	20700	}else
20806		-#endif /* !SQLITE_SHELL_FIDDLE */
	20701	+#endif /* !SQLITE_SHELL_WASM_MODE */
20807	20702	if( z[0]=='-' ){
20808	20703	utf8_printf(stderr, "unknown option: %s\n", z);
20809	20704	rc = 1;
20810	20705	goto meta_command_exit;
20811	20706	}else if( zFN ){
		@@ -20829,11 +20724,11 @@
20829	20724	p->szMax = 0;
20830	20725
20831	20726	/* If a filename is specified, try to open it first */
20832	20727	if( zFN \|\| p->openMode==SHELL_OPEN_HEXDB ){
20833	20728	if( newFlag && zFN && !p->bSafeMode ) shellDeleteFile(zFN);
20834		-#ifndef SQLITE_SHELL_FIDDLE
	20729	+#ifndef SQLITE_SHELL_WASM_MODE
20835	20730	if( p->bSafeMode
20836	20731	&& p->openMode!=SHELL_OPEN_HEXDB
20837	20732	&& zFN
20838	20733	&& strcmp(zFN,":memory:")!=0
20839	20734	){
		@@ -20862,11 +20757,11 @@
20862	20757	p->pAuxDb->zDbFilename = 0;
20863	20758	open_db(p, 0);
20864	20759	}
20865	20760	}else
20866	20761
20867		-#ifndef SQLITE_SHELL_FIDDLE
	20762	+#ifndef SQLITE_SHELL_WASM_MODE
20868	20763	if( (c=='o'
20869	20764	&& (strncmp(azArg[0], "output", n)==0\|\|strncmp(azArg[0], "once", n)==0))
20870	20765	\|\| (c=='e' && n==5 && strcmp(azArg[0],"excel")==0)
20871	20766	){
20872	20767	char *zFile = 0;
		@@ -20978,11 +20873,11 @@
20978	20873	sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
20979	20874	}
20980	20875	}
20981	20876	sqlite3_free(zFile);
20982	20877	}else
20983		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	20878	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
20984	20879
20985	20880	if( c=='p' && n>=3 && strncmp(azArg[0], "parameter", n)==0 ){
20986	20881	open_db(p,0);
20987	20882	if( nArg<=1 ) goto parameter_syntax_error;
20988	20883
		@@ -21148,17 +21043,17 @@
21148	21043	if( nArg >= 3) {
21149	21044	strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
21150	21045	}
21151	21046	}else
21152	21047
21153		-#ifndef SQLITE_SHELL_FIDDLE
	21048	+#ifndef SQLITE_SHELL_WASM_MODE
21154	21049	if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
21155	21050	rc = 2;
21156	21051	}else
21157	21052	#endif
21158	21053
21159		-#ifndef SQLITE_SHELL_FIDDLE
	21054	+#ifndef SQLITE_SHELL_WASM_MODE
21160	21055	if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
21161	21056	FILE *inSaved = p->in;
21162	21057	int savedLineno = p->lineno;
21163	21058	failIfSafeMode(p, "cannot run .read in safe mode");
21164	21059	if( nArg!=2 ){
		@@ -21189,13 +21084,13 @@
21189	21084	fclose(p->in);
21190	21085	}
21191	21086	p->in = inSaved;
21192	21087	p->lineno = savedLineno;
21193	21088	}else
21194		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	21089	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
21195	21090
21196		-#ifndef SQLITE_SHELL_FIDDLE
	21091	+#ifndef SQLITE_SHELL_WASM_MODE
21197	21092	if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
21198	21093	const char *zSrcFile;
21199	21094	const char *zDb;
21200	21095	sqlite3 *pSrc;
21201	21096	sqlite3_backup *pBackup;
		@@ -21243,11 +21138,11 @@
21243	21138	utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
21244	21139	rc = 1;
21245	21140	}
21246	21141	close_db(pSrc);
21247	21142	}else
21248		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	21143	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
21249	21144
21250	21145	if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
21251	21146	if( nArg==2 ){
21252	21147	p->scanstatsOn = (u8)booleanValue(azArg[1]);
21253	21148	#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
		@@ -21869,11 +21764,11 @@
21869	21764	shell_exec(p, zSql, 0);
21870	21765	}
21871	21766	sqlite3_free(zSql);
21872	21767	}else
21873	21768
21874		-#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
	21769	+#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
21875	21770	if( c=='s'
21876	21771	&& (strncmp(azArg[0], "shell", n)==0 \|\| strncmp(azArg[0],"system",n)==0)
21877	21772	){
21878	21773	char *zCmd;
21879	21774	int i, x;
		@@ -21890,11 +21785,11 @@
21890	21785	}
21891	21786	x = zCmd!=0 ? system(zCmd) : 1;
21892	21787	sqlite3_free(zCmd);
21893	21788	if( x ) raw_printf(stderr, "System command returns %d\n", x);
21894	21789	}else
21895		-#endif /* !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE) */
	21790	+#endif /* !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE) */
21896	21791
21897	21792	if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
21898	21793	static const char *azBool[] = { "off", "on", "trigger", "full"};
21899	21794	const char *zOut;
21900	21795	int i;
		@@ -22070,11 +21965,11 @@
22070	21965
22071	21966	for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
22072	21967	sqlite3_free(azResult);
22073	21968	}else
22074	21969
22075		-#ifndef SQLITE_SHELL_FIDDLE
	21970	+#ifndef SQLITE_SHELL_WASM_MODE
22076	21971	/* Begin redirecting output to the file "testcase-out.txt" */
22077	21972	if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
22078	21973	output_reset(p);
22079	21974	p->out = output_file_open("testcase-out.txt", 0);
22080	21975	if( p->out==0 ){
		@@ -22084,11 +21979,11 @@
22084	21979	sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
22085	21980	}else{
22086	21981	sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
22087	21982	}
22088	21983	}else
22089		-#endif /* !defined(SQLITE_SHELL_FIDDLE) */
	21984	+#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
22090	21985
22091	21986	#ifndef SQLITE_UNTESTABLE
22092	21987	if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 ){
22093	21988	static const struct {
22094	21989	const char zCtrlName; / Name of a test-control option */
		@@ -22756,11 +22651,11 @@
22756	22651
22757	22652	static void echo_group_input(ShellState p, const char zDo){
22758	22653	if( ShellHasFlag(p, SHFLG_Echo) ) utf8_printf(p->out, "%s\n", zDo);
22759	22654	}
22760	22655
22761		-#ifdef SQLITE_SHELL_FIDDLE
	22656	+#ifdef SQLITE_SHELL_WASM_MODE
22762	22657	/*
22763	22658	** Alternate one_input_line() impl for wasm mode. This is not in the primary impl
22764	22659	** because we need the global shellState and cannot access it from that function
22765	22660	** without moving lots of code around (creating a larger/messier diff).
22766	22661	*/
		@@ -22787,11 +22682,11 @@
22787	22682	shell_check_oom(zLine);
22788	22683	memcpy(zLine, zBegin, (size_t)nZ);
22789	22684	zLine[nZ] = 0;
22790	22685	return zLine;
22791	22686	}
22792		-#endif /* SQLITE_SHELL_FIDDLE */
	22687	+#endif /* SQLITE_SHELL_WASM_MODE */
22793	22688
22794	22689	/*
22795	22690	** Read input from in and process it. If in==0 then input
22796	22691	** is interactive - the user is typing it it. Otherwise, input
22797	22692	** is coming from a file or device. A prompt is issued and history
		@@ -23170,11 +23065,11 @@
23170	23065	# else
23171	23066	# define SQLITE_SHELL_IS_UTF8 (1)
23172	23067	# endif
23173	23068	#endif
23174	23069
23175		-#ifdef SQLITE_SHELL_FIDDLE
	23070	+#ifdef SQLITE_SHELL_WASM_MODE
23176	23071	# define main fiddle_main
23177	23072	#endif
23178	23073
23179	23074	#if SQLITE_SHELL_IS_UTF8
23180	23075	int SQLITE_CDECL main(int argc, char **argv){
		@@ -23184,11 +23079,11 @@
23184	23079	#endif
23185	23080	#ifdef SQLITE_DEBUG
23186	23081	sqlite3_int64 mem_main_enter = sqlite3_memory_used();
23187	23082	#endif
23188	23083	char *zErrMsg = 0;
23189		-#ifdef SQLITE_SHELL_FIDDLE
	23084	+#ifdef SQLITE_SHELL_WASM_MODE
23190	23085	# define data shellState
23191	23086	#else
23192	23087	ShellState data;
23193	23088	#endif
23194	23089	const char *zInitFile = 0;
		@@ -23204,11 +23099,11 @@
23204	23099	int argcToFree = 0;
23205	23100	#endif
23206	23101
23207	23102	setBinaryMode(stdin, 0);
23208	23103	setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
23209		-#ifdef SQLITE_SHELL_FIDDLE
	23104	+#ifdef SQLITE_SHELL_WASM_MODE
23210	23105	stdin_is_interactive = 0;
23211	23106	stdout_is_console = 1;
23212	23107	#else
23213	23108	stdin_is_interactive = isatty(0);
23214	23109	stdout_is_console = isatty(1);
		@@ -23466,11 +23361,11 @@
23466	23361	utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
23467	23362	return 1;
23468	23363	#endif
23469	23364	}
23470	23365	data.out = stdout;
23471		-#ifndef SQLITE_SHELL_FIDDLE
	23366	+#ifndef SQLITE_SHELL_WASM_MODE
23472	23367	sqlite3_appendvfs_init(0,0,0);
23473	23368	#endif
23474	23369
23475	23370	/* Go ahead and open the database file if it already exists. If the
23476	23371	** file does not exist, delay opening it. This prevents empty database
		@@ -23734,11 +23629,11 @@
23734	23629	}else{
23735	23630	data.in = stdin;
23736	23631	rc = process_input(&data);
23737	23632	}
23738	23633	}
23739		-#ifndef SQLITE_SHELL_FIDDLE
	23634	+#ifndef SQLITE_SHELL_WASM_MODE
23740	23635	/* In WASM mode we have to leave the db state in place so that
23741	23636	** client code can "push" SQL into it after this call returns. */
23742	23637	free(azCmd);
23743	23638	set_table_name(&data, 0);
23744	23639	if( data.db ){
		@@ -23769,16 +23664,16 @@
23769	23664	if( sqlite3_memory_used()>mem_main_enter ){
23770	23665	utf8_printf(stderr, "Memory leaked: %u bytes\n",
23771	23666	(unsigned int)(sqlite3_memory_used()-mem_main_enter));
23772	23667	}
23773	23668	#endif
23774		-#endif /* !SQLITE_SHELL_FIDDLE */
	23669	+#endif /* !SQLITE_SHELL_WASM_MODE */
23775	23670	return rc;
23776	23671	}
23777	23672
23778	23673
23779		-#ifdef SQLITE_SHELL_FIDDLE
	23674	+#ifdef SQLITE_SHELL_WASM_MODE
23780	23675	/* Only for emcc experimentation purposes. */
23781	23676	int fiddle_experiment(int a,int b){
23782	23677	return a + b;
23783	23678	}
23784	23679
		@@ -23895,6 +23790,6 @@
23895	23790	shellState.wasm.zPos = zSql;
23896	23791	process_input(&shellState);
23897	23792	memset(&shellState.wasm, 0, sizeof(shellState.wasm));
23898	23793	}
23899	23794	}
23900		-#endif /* SQLITE_SHELL_FIDDLE */
	23795	+#endif /* SQLITE_SHELL_WASM_MODE */
23901	23796

	--- extsrc/shell.c
	+++ extsrc/shell.c
	@@ -53,19 +53,10 @@
53	*/
54	#if !defined(SQLITE_OS_WINRT)
55	# define SQLITE_OS_WINRT 0
56	#endif
57
58	/*
59	** If SQLITE_SHELL_FIDDLE is defined then the shell is modified
60	** somewhat for use as a WASM module in a web browser. This flag
61	** should only be used when building the "fiddle" web application, as
62	** the browser-mode build has much different user input requirements
63	** and this build mode rewires the user input subsystem to account for
64	** that.
65	*/
66
67	/*
68	** Warning pragmas copied from msvc.h in the core.
69	*/
70	#if defined(_MSC_VER)
71	#pragma warning(disable : 4054)
	@@ -254,10 +245,21 @@
254	#else
255	# define setBinaryMode(X,Y)
256	# define setTextMode(X,Y)
257	#endif
258











259	/* True if the timer is enabled */
260	static int enableTimer = 0;
261
262	/* Return the current wall-clock time */
263	static sqlite3_int64 timeOfDay(void){
	@@ -715,11 +717,11 @@
715	**
716	** The result is stored in space obtained from malloc() and must either
717	** be freed by the caller or else passed back into this routine via the
718	** zPrior argument for reuse.
719	*/
720	#ifndef SQLITE_SHELL_FIDDLE
721	static char one_input_line(FILE in, char *zPrior, int isContinuation){
722	char *zPrompt;
723	char *zResult;
724	if( in!=0 ){
725	zResult = local_getline(zPrior, in);
	@@ -735,11 +737,11 @@
735	if( zResult && *zResult ) shell_add_history(zResult);
736	#endif
737	}
738	return zResult;
739	}
740	#endif /* !SQLITE_SHELL_FIDDLE */
741
742	/*
743	** Return the value of a hexadecimal digit. Return -1 if the input
744	** is not a hex digit.
745	*/
	@@ -3792,11 +3794,10 @@
3792	#define re_compile sqlite3re_compile
3793	#define re_free sqlite3re_free
3794
3795	/* The end-of-input character */
3796	#define RE_EOF 0 /* End of input */
3797	#define RE_START 0xfffffff /* Start of input - larger than an UTF-8 */
3798
3799	/* The NFA is implemented as sequence of opcodes taken from the following
3800	** set. Each opcode has a single integer argument.
3801	*/
3802	#define RE_OP_MATCH 1 /* Match the one character in the argument */
	@@ -3814,37 +3815,10 @@
3814	#define RE_OP_DIGIT 13 /* digit: [0-9] */
3815	#define RE_OP_NOTDIGIT 14 /* Not a digit */
3816	#define RE_OP_SPACE 15 /* space: [ \t\n\r\v\f] */
3817	#define RE_OP_NOTSPACE 16 /* Not a digit */
3818	#define RE_OP_BOUNDARY 17 /* Boundary between word and non-word */
3819	#define RE_OP_ATSTART 18 /* Currently at the start of the string */
3820
3821	#if defined(SQLITE_DEBUG)
3822	/* Opcode names used for symbolic debugging */
3823	static const char *ReOpName[] = {
3824	"EOF",
3825	"MATCH",
3826	"ANY",
3827	"ANYSTAR",
3828	"FORK",
3829	"GOTO",
3830	"ACCEPT",
3831	"CC_INC",
3832	"CC_EXC",
3833	"CC_VALUE",
3834	"CC_RANGE",
3835	"WORD",
3836	"NOTWORD",
3837	"DIGIT",
3838	"NOTDIGIT",
3839	"SPACE",
3840	"NOTSPACE",
3841	"BOUNDARY",
3842	"ATSTART",
3843	};
3844	#endif /* SQLITE_DEBUG */
3845
3846
3847	/* Each opcode is a "state" in the NFA */
3848	typedef unsigned short ReStateNumber;
3849
3850	/* Because this is an NFA and not a DFA, multiple states can be active at
	@@ -3875,11 +3849,11 @@
3875	const char zErr; / Error message to return */
3876	char aOp; / Operators for the virtual machine */
3877	int aArg; / Arguments to each operator */
3878	unsigned (xNextChar)(ReInput); /* Next character function */
3879	unsigned char zInit[12]; /* Initial text to match */
3880	int nInit; /* Number of bytes in zInit */
3881	unsigned nState; /* Number of entries in aOp[] and aArg[] */
3882	unsigned nAlloc; /* Slots allocated for aOp[] and aArg[] */
3883	};
3884
3885	/* Add a state to the given state set if it is not already there */
	@@ -3948,11 +3922,11 @@
3948	ReStateSet aStateSet[2], pThis, pNext;
3949	ReStateNumber aSpace[100];
3950	ReStateNumber *pToFree;
3951	unsigned int i = 0;
3952	unsigned int iSwap = 0;
3953	int c = RE_START;
3954	int cPrev = 0;
3955	int rc = 0;
3956	ReInput in;
3957
3958	in.z = zIn;
	@@ -3967,11 +3941,10 @@
3967	strncmp((const char)zIn+in.i, (const char)pRe->zInit, pRe->nInit)!=0)
3968	){
3969	in.i++;
3970	}
3971	if( in.i+pRe->nInit>in.mx ) return 0;
3972	c = RE_START-1;
3973	}
3974
3975	if( pRe->nState<=(sizeof(aSpace)/(sizeof(aSpace[0])*2)) ){
3976	pToFree = 0;
3977	aStateSet[0].aState = aSpace;
	@@ -3996,14 +3969,10 @@
3996	switch( pRe->aOp[x] ){
3997	case RE_OP_MATCH: {
3998	if( pRe->aArg[x]==c ) re_add_state(pNext, x+1);
3999	break;
4000	}
4001	case RE_OP_ATSTART: {
4002	if( cPrev==RE_START ) re_add_state(pThis, x+1);
4003	break;
4004	}
4005	case RE_OP_ANY: {
4006	if( c!=0 ) re_add_state(pNext, x+1);
4007	break;
4008	}
4009	case RE_OP_WORD: {
	@@ -4081,13 +4050,11 @@
4081	}
4082	}
4083	}
4084	}
4085	for(i=0; i<pNext->nState; i++){
4086	int x = pNext->aState[i];
4087	while( pRe->aOp[x]==RE_OP_GOTO ) x += pRe->aArg[x];
4088	if( pRe->aOp[x]==RE_OP_ACCEPT ){ rc = 1; break; }
4089	}
4090	re_match_end:
4091	sqlite3_free(pToFree);
4092	return rc;
4093	}
	@@ -4238,10 +4205,11 @@
4238	const char *zErr;
4239	while( (c = p->xNextChar(&p->sIn))!=0 ){
4240	iStart = p->nState;
4241	switch( c ){
4242	case '\|':

4243	case ')': {
4244	p->sIn.i--;
4245	return 0;
4246	}
4247	case '(': {
	@@ -4274,18 +4242,10 @@
4274	case '?': {
4275	if( iPrev<0 ) return "'?' without operand";
4276	re_insert(p, iPrev, RE_OP_FORK, p->nState - iPrev+1);
4277	break;
4278	}
4279	case '$': {
4280	re_append(p, RE_OP_MATCH, RE_EOF);
4281	break;
4282	}
4283	case '^': {
4284	re_append(p, RE_OP_ATSTART, 0);
4285	break;
4286	}
4287	case '{': {
4288	int m = 0, n = 0;
4289	int sz, j;
4290	if( iPrev<0 ) return "'{m,n}' without operand";
4291	while( (c=rePeek(p))>='0' && c<='9' ){ m = m*10 + c - '0'; p->sIn.i++; }
	@@ -4300,11 +4260,10 @@
4300	p->sIn.i++;
4301	sz = p->nState - iPrev;
4302	if( m==0 ){
4303	if( n==0 ) return "both m and n are zero in '{m,n}'";
4304	re_insert(p, iPrev, RE_OP_FORK, sz+1);
4305	iPrev++;
4306	n--;
4307	}else{
4308	for(j=1; j<m; j++) re_copy(p, iPrev, sz);
4309	}
4310	for(j=m; j<n; j++){
	@@ -4419,11 +4378,15 @@
4419	zErr = re_subcompile_re(pRe);
4420	if( zErr ){
4421	re_free(pRe);
4422	return zErr;
4423	}
4424	if( pRe->sIn.i>=pRe->sIn.mx ){




4425	re_append(pRe, RE_OP_ACCEPT, 0);
4426	*ppRe = pRe;
4427	}else{
4428	re_free(pRe);
4429	return "unrecognized character";
	@@ -4502,71 +4465,10 @@
4502	}
4503	if( setAux ){
4504	sqlite3_set_auxdata(context, 0, pRe, (void()(void))re_free);
4505	}
4506	}
4507
4508	#if defined(SQLITE_DEBUG)
4509	/*
4510	** This function is used for testing and debugging only. It is only available
4511	** if the SQLITE_DEBUG compile-time option is used.
4512	**
4513	** Compile a regular expression and then convert the compiled expression into
4514	** text and return that text.
4515	*/
4516	static void re_bytecode_func(
4517	sqlite3_context *context,
4518	int argc,
4519	sqlite3_value **argv
4520	){
4521	const char *zPattern;
4522	const char *zErr;
4523	ReCompiled *pRe;
4524	sqlite3_str *pStr;
4525	int i;
4526	int n;
4527	char *z;
4528
4529	zPattern = (const char*)sqlite3_value_text(argv[0]);
4530	if( zPattern==0 ) return;
4531	zErr = re_compile(&pRe, zPattern, sqlite3_user_data(context)!=0);
4532	if( zErr ){
4533	re_free(pRe);
4534	sqlite3_result_error(context, zErr, -1);
4535	return;
4536	}
4537	if( pRe==0 ){
4538	sqlite3_result_error_nomem(context);
4539	return;
4540	}
4541	pStr = sqlite3_str_new(0);
4542	if( pStr==0 ) goto re_bytecode_func_err;
4543	if( pRe->nInit>0 ){
4544	sqlite3_str_appendf(pStr, "INIT ");
4545	for(i=0; i<pRe->nInit; i++){
4546	sqlite3_str_appendf(pStr, "%02x", pRe->zInit[i]);
4547	}
4548	sqlite3_str_appendf(pStr, "\n");
4549	}
4550	for(i=0; i<pRe->nState; i++){
4551	sqlite3_str_appendf(pStr, "%-8s %4d\n",
4552	ReOpName[(unsigned char)pRe->aOp[i]], pRe->aArg[i]);
4553	}
4554	n = sqlite3_str_length(pStr);
4555	z = sqlite3_str_finish(pStr);
4556	if( n==0 ){
4557	sqlite3_free(z);
4558	}else{
4559	sqlite3_result_text(context, z, n-1, sqlite3_free);
4560	}
4561
4562	re_bytecode_func_err:
4563	re_free(pRe);
4564	}
4565
4566	#endif /* SQLITE_DEBUG */
4567
4568
4569	/*
4570	** Invoke this routine to register the regexp() function with the
4571	** SQLite database connection.
4572	*/
	@@ -4588,23 +4490,16 @@
4588	/* The regexpi(PATTERN,STRING) function is a case-insensitive version
4589	** of regexp(PATTERN,STRING). */
4590	rc = sqlite3_create_function(db, "regexpi", 2,
4591	SQLITE_UTF8\|SQLITE_INNOCUOUS\|SQLITE_DETERMINISTIC,
4592	(void*)db, re_sql_func, 0, 0);
4593	#if defined(SQLITE_DEBUG)
4594	if( rc==SQLITE_OK ){
4595	rc = sqlite3_create_function(db, "regexp_bytecode", 1,
4596	SQLITE_UTF8\|SQLITE_INNOCUOUS\|SQLITE_DETERMINISTIC,
4597	0, re_bytecode_func, 0, 0);
4598	}
4599	#endif /* SQLITE_DEBUG */
4600	}
4601	return rc;
4602	}
4603
4604	/*********************** End ../ext/misc/regexp.c ******************/
4605	#ifndef SQLITE_SHELL_FIDDLE
4606	/*********************** Begin ../ext/misc/fileio.c ****************/
4607	/*
4608	** 2014-06-13
4609	**
4610	** The author disclaims copyright to this source code. In place of
	@@ -12353,19 +12248,19 @@
12353	int nIndent; /* Size of array aiIndent[] */
12354	int iIndent; /* Index of current op in aiIndent[] */
12355	char zNonce; / Nonce for temporary safe-mode excapes */
12356	EQPGraph sGraph; /* Information for the graphical EXPLAIN QUERY PLAN */
12357	ExpertInfo expert; /* Valid if previous command was ".expert OPT..." */
12358	#ifdef SQLITE_SHELL_FIDDLE
12359	struct {
12360	const char * zInput; /* Input string from wasm/JS proxy */
12361	const char * zPos; /* Cursor pos into zInput */
12362	} wasm;
12363	#endif
12364	};
12365
12366	#ifdef SQLITE_SHELL_FIDDLE
12367	static ShellState shellState;
12368	#endif
12369
12370
12371	/* Allowed values for ShellState.autoEQP
	@@ -13029,11 +12924,11 @@
13029	UNUSED_PARAMETER(zA2);
13030	UNUSED_PARAMETER(zA3);
13031	UNUSED_PARAMETER(zA4);
13032	switch( op ){
13033	case SQLITE_ATTACH: {
13034	#ifndef SQLITE_SHELL_FIDDLE
13035	/* In WASM builds the filesystem is a virtual sandbox, so
13036	** there's no harm in using ATTACH. */
13037	failIfSafeMode(p, "cannot run ATTACH in safe mode");
13038	#endif
13039	break;
	@@ -15443,11 +15338,11 @@
15443	** There must be two or more spaces between the end of the command and the
15444	** start of the description of what that command does.
15445	*/
15446	static const char *(azHelp[]) = {
15447	#if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE) \
15448	&& !defined(SQLITE_SHELL_FIDDLE)
15449	".archive ... Manage SQL archives",
15450	" Each command must have exactly one of the following options:",
15451	" -c, --create Create a new archive",
15452	" -u, --update Add or update files with changed mtime",
15453	" -i, --insert Like -u but always add even if unchanged",
	@@ -15469,23 +15364,23 @@
15469	" http://sqlite.org/cli.html#sqlite_archive_support",
15470	#endif
15471	#ifndef SQLITE_OMIT_AUTHORIZATION
15472	".auth ON\|OFF Show authorizer callbacks",
15473	#endif
15474	#ifndef SQLITE_SHELL_FIDDLE
15475	".backup ?DB? FILE Backup DB (default \"main\") to FILE",
15476	" Options:",
15477	" --append Use the appendvfs",
15478	" --async Write to FILE without journal and fsync()",
15479	#endif
15480	".bail on\|off Stop after hitting an error. Default OFF",
15481	".binary on\|off Turn binary output on or off. Default OFF",
15482	#ifndef SQLITE_SHELL_FIDDLE
15483	".cd DIRECTORY Change the working directory to DIRECTORY",
15484	#endif
15485	".changes on\|off Show number of rows changed by SQL",
15486	#ifndef SQLITE_SHELL_FIDDLE
15487	".check GLOB Fail if output since .testcase does not match",
15488	".clone NEWDB Clone data into NEWDB from the existing database",
15489	#endif
15490	".connection [close] [#] Open or close an auxiliary database connection",
15491	".databases List names and files of attached databases",
	@@ -15507,15 +15402,15 @@
15507	#ifdef SQLITE_DEBUG
15508	" test Show raw EXPLAIN QUERY PLAN output",
15509	" trace Like \"full\" but enable \"PRAGMA vdbe_trace\"",
15510	#endif
15511	" trigger Like \"full\" but also show trigger bytecode",
15512	#ifndef SQLITE_SHELL_FIDDLE
15513	".excel Display the output of next command in spreadsheet",
15514	" --bom Put a UTF8 byte-order mark on intermediate file",
15515	#endif
15516	#ifndef SQLITE_SHELL_FIDDLE
15517	".exit ?CODE? Exit this program with return-code CODE",
15518	#endif
15519	".expert EXPERIMENTAL. Suggest indexes for queries",
15520	".explain ?on\|off\|auto? Change the EXPLAIN formatting mode. Default: auto",
15521	".filectrl CMD ... Run various sqlite3_file_control() operations",
	@@ -15522,11 +15417,11 @@
15522	" --schema SCHEMA Use SCHEMA instead of \"main\"",
15523	" --help Show CMD details",
15524	".fullschema ?--indent? Show schema and the content of sqlite_stat tables",
15525	".headers on\|off Turn display of headers on or off",
15526	".help ?-all? ?PATTERN? Show help text for PATTERN",
15527	#ifndef SQLITE_SHELL_FIDDLE
15528	".import FILE TABLE Import data from FILE into TABLE",
15529	" Options:",
15530	" --ascii Use \\037 and \\036 as column and row separators",
15531	" --csv Use , and \\n as column and row separators",
15532	" --skip N Skip the first N rows of input",
	@@ -15551,14 +15446,14 @@
15551	#endif
15552	".limit ?LIMIT? ?VAL? Display or change the value of an SQLITE_LIMIT",
15553	".lint OPTIONS Report potential schema issues.",
15554	" Options:",
15555	" fkey-indexes Find missing foreign key indexes",
15556	#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
15557	".load FILE ?ENTRY? Load an extension library",
15558	#endif
15559	#ifndef SQLITE_SHELL_FIDDLE
15560	".log FILE\|off Turn logging on or off. FILE can be stderr/stdout",
15561	#endif
15562	".mode MODE ?OPTIONS? Set output mode",
15563	" MODE is one of:",
15564	" ascii Columns/rows delimited by 0x1F and 0x1E",
	@@ -15581,15 +15476,15 @@
15581	" --wordwrap B Wrap or not at word boundaries per B (on/off)",
15582	" --ww Shorthand for \"--wordwrap 1\"",
15583	" --quote Quote output text as SQL literals",
15584	" --noquote Do not quote output text",
15585	" TABLE The name of SQL table used for \"insert\" mode",
15586	#ifndef SQLITE_SHELL_FIDDLE
15587	".nonce STRING Suspend safe mode for one command if nonce matches",
15588	#endif
15589	".nullvalue STRING Use STRING in place of NULL values",
15590	#ifndef SQLITE_SHELL_FIDDLE
15591	".once ?OPTIONS? ?FILE? Output for the next SQL command only to FILE",
15592	" If FILE begins with '\|' then open as a pipe",
15593	" --bom Put a UTF8 byte-order mark at the beginning",
15594	" -e Send output to the system text editor",
15595	" -x Send output as CSV to a spreadsheet (same as \".excel\")",
	@@ -15607,11 +15502,11 @@
15607	#endif
15608	" --new Initialize FILE to an empty database",
15609	" --nofollow Do not follow symbolic links",
15610	" --readonly Open FILE readonly",
15611	" --zip FILE is a ZIP archive",
15612	#ifndef SQLITE_SHELL_FIDDLE
15613	".output ?FILE? Send output to FILE or stdout if FILE is omitted",
15614	" If FILE begins with '\|' then open it as a pipe.",
15615	" Options:",
15616	" --bom Prefix output with a UTF8 byte-order mark",
15617	" -e Send output to the system text editor",
	@@ -15631,11 +15526,11 @@
15631	" --once Do no more than one progress interrupt",
15632	" --quiet\|-q No output except at interrupts",
15633	" --reset Reset the count for each input and interrupt",
15634	#endif
15635	".prompt MAIN CONTINUE Replace the standard prompts",
15636	#ifndef SQLITE_SHELL_FIDDLE
15637	".quit Exit this program",
15638	".read FILE Read input from FILE or command output",
15639	" If FILE begins with \"\|\", it is a command that generates the input.",
15640	#endif
15641	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
	@@ -15644,11 +15539,11 @@
15644	" --recovery-db NAME Store recovery metadata in database file NAME",
15645	" --lost-and-found TABLE Alternative name for the lost-and-found table",
15646	" --no-rowids Do not attempt to recover rowid values",
15647	" that are not also INTEGER PRIMARY KEYs",
15648	#endif
15649	#ifndef SQLITE_SHELL_FIDDLE
15650	".restore ?DB? FILE Restore content of DB (default \"main\") from FILE",
15651	".save ?OPTIONS? FILE Write database to FILE (an alias for .backup ...)",
15652	#endif
15653	".scanstats on\|off Turn sqlite3_stmt_scanstatus() metrics on or off",
15654	".schema ?PATTERN? Show the CREATE statements matching PATTERN",
	@@ -15681,24 +15576,24 @@
15681	" --sha3-224 Use the sha3-224 algorithm",
15682	" --sha3-256 Use the sha3-256 algorithm (default)",
15683	" --sha3-384 Use the sha3-384 algorithm",
15684	" --sha3-512 Use the sha3-512 algorithm",
15685	" Any other argument is a LIKE pattern for tables to hash",
15686	#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
15687	".shell CMD ARGS... Run CMD ARGS... in a system shell",
15688	#endif
15689	".show Show the current values for various settings",
15690	".stats ?ARG? Show stats or turn stats on or off",
15691	" off Turn off automatic stat display",
15692	" on Turn on automatic stat display",
15693	" stmt Show statement stats",
15694	" vmstep Show the virtual machine step count only",
15695	#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
15696	".system CMD ARGS... Run CMD ARGS... in a system shell",
15697	#endif
15698	".tables ?TABLE? List names of tables matching LIKE pattern TABLE",
15699	#ifndef SQLITE_SHELL_FIDDLE
15700	".testcase NAME Begin redirecting output to 'testcase-out.txt'",
15701	#endif
15702	".testctrl CMD ... Run various sqlite3_test_control() operations",
15703	" Run \".testctrl\" with no arguments for details",
15704	".timeout MS Try opening locked tables for MS milliseconds",
	@@ -16247,11 +16142,11 @@
16247	sqlite3_uint_init(p->db, 0, 0);
16248	sqlite3_decimal_init(p->db, 0, 0);
16249	sqlite3_regexp_init(p->db, 0, 0);
16250	sqlite3_ieee_init(p->db, 0, 0);
16251	sqlite3_series_init(p->db, 0, 0);
16252	#ifndef SQLITE_SHELL_FIDDLE
16253	sqlite3_fileio_init(p->db, 0, 0);
16254	sqlite3_completion_init(p->db, 0, 0);
16255	#endif
16256	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
16257	sqlite3_dbdata_init(p->db, 0, 0);
	@@ -19377,19 +19272,19 @@
19377	}
19378	}else
19379	#endif
19380
19381	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) \
19382	&& !defined(SQLITE_SHELL_FIDDLE)
19383	if( c=='a' && strncmp(azArg[0], "archive", n)==0 ){
19384	open_db(p, 0);
19385	failIfSafeMode(p, "cannot run .archive in safe mode");
19386	rc = arDotCommand(p, 0, azArg, nArg);
19387	}else
19388	#endif
19389
19390	#ifndef SQLITE_SHELL_FIDDLE
19391	if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
19392	\|\| (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
19393	){
19394	const char *zDestFile = 0;
19395	const char *zDb = 0;
	@@ -19454,11 +19349,11 @@
19454	utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
19455	rc = 1;
19456	}
19457	close_db(pDest);
19458	}else
19459	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
19460
19461	if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
19462	if( nArg==2 ){
19463	bail_on_error = booleanValue(azArg[1]);
19464	}else{
	@@ -19485,11 +19380,11 @@
19485	*/
19486	if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
19487	test_breakpoint();
19488	}else
19489
19490	#ifndef SQLITE_SHELL_FIDDLE
19491	if( c=='c' && strcmp(azArg[0],"cd")==0 ){
19492	failIfSafeMode(p, "cannot run .cd in safe mode");
19493	if( nArg==2 ){
19494	#if defined(_WIN32) \|\| defined(WIN32)
19495	wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
	@@ -19505,11 +19400,11 @@
19505	}else{
19506	raw_printf(stderr, "Usage: .cd DIRECTORY\n");
19507	rc = 1;
19508	}
19509	}else
19510	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
19511
19512	if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
19513	if( nArg==2 ){
19514	setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
19515	}else{
	@@ -19516,11 +19411,11 @@
19516	raw_printf(stderr, "Usage: .changes on\|off\n");
19517	rc = 1;
19518	}
19519	}else
19520
19521	#ifndef SQLITE_SHELL_FIDDLE
19522	/* Cancel output redirection, if it is currently set (by .testcase)
19523	** Then read the content of the testcase-out.txt file and compare against
19524	** azArg[1]. If there are differences, report an error and exit.
19525	*/
19526	if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
	@@ -19541,23 +19436,23 @@
19541	utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
19542	p->nCheck++;
19543	}
19544	sqlite3_free(zRes);
19545	}else
19546	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
19547
19548	#ifndef SQLITE_SHELL_FIDDLE
19549	if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
19550	failIfSafeMode(p, "cannot run .clone in safe mode");
19551	if( nArg==2 ){
19552	tryToClone(p, azArg[1]);
19553	}else{
19554	raw_printf(stderr, "Usage: .clone FILENAME\n");
19555	rc = 1;
19556	}
19557	}else
19558	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
19559
19560	if( c=='c' && strncmp(azArg[0], "connection", n)==0 ){
19561	if( nArg==1 ){
19562	/* List available connections */
19563	int i;
	@@ -19842,11 +19737,11 @@
19842	raw_printf(stderr, "Usage: .eqp off\|on\|trace\|trigger\|full\n");
19843	rc = 1;
19844	}
19845	}else
19846
19847	#ifndef SQLITE_SHELL_FIDDLE
19848	if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
19849	if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
19850	rc = 2;
19851	}else
19852	#endif
	@@ -20102,11 +19997,11 @@
20102	}else{
20103	showHelp(p->out, 0);
20104	}
20105	}else
20106
20107	#ifndef SQLITE_SHELL_FIDDLE
20108	if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
20109	char zTable = 0; / Insert data into this table */
20110	char zSchema = 0; / within this schema (may default to "main") */
20111	char zFile = 0; / Name of file to extra content from */
20112	sqlite3_stmt pStmt = NULL; / A statement */
	@@ -20393,11 +20288,11 @@
20393	utf8_printf(p->out,
20394	"Added %d rows with %d errors using %d lines of input\n",
20395	sCtx.nRow, sCtx.nErr, sCtx.nLine-1);
20396	}
20397	}else
20398	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
20399
20400	#ifndef SQLITE_UNTESTABLE
20401	if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
20402	char *zSql;
20403	char *zCollist = 0;
	@@ -20583,11 +20478,11 @@
20583	if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
20584	open_db(p, 0);
20585	lintDotCommand(p, azArg, nArg);
20586	}else
20587
20588	#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
20589	if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
20590	const char zFile, zProc;
20591	char *zErrMsg = 0;
20592	failIfSafeMode(p, "cannot run .load in safe mode");
20593	if( nArg<2 ){
	@@ -20605,11 +20500,11 @@
20605	rc = 1;
20606	}
20607	}else
20608	#endif
20609
20610	#ifndef SQLITE_SHELL_FIDDLE
20611	if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
20612	failIfSafeMode(p, "cannot run .log in safe mode");
20613	if( nArg!=2 ){
20614	raw_printf(stderr, "Usage: .log FILENAME\n");
20615	rc = 1;
	@@ -20742,11 +20637,11 @@
20742	rc = 1;
20743	}
20744	p->cMode = p->mode;
20745	}else
20746
20747	#ifndef SQLITE_SHELL_FIDDLE
20748	if( c=='n' && strcmp(azArg[0], "nonce")==0 ){
20749	if( nArg!=2 ){
20750	raw_printf(stderr, "Usage: .nonce NONCE\n");
20751	rc = 1;
20752	}else if( p->zNonce==0 \|\| strcmp(azArg[1],p->zNonce)!=0 ){
	@@ -20757,11 +20652,11 @@
20757	p->bSafeMode = 0;
20758	return 0; /* Return immediately to bypass the safe mode reset
20759	** at the end of this procedure */
20760	}
20761	}else
20762	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
20763
20764	if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
20765	if( nArg==2 ){
20766	sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
20767	"%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
	@@ -20779,11 +20674,11 @@
20779	int openMode = SHELL_OPEN_UNSPEC;
20780
20781	/* Check for command-line arguments */
20782	for(iName=1; iName<nArg; iName++){
20783	const char *z = azArg[iName];
20784	#ifndef SQLITE_SHELL_FIDDLE
20785	if( optionMatch(z,"new") ){
20786	newFlag = 1;
20787	#ifdef SQLITE_HAVE_ZLIB
20788	}else if( optionMatch(z, "zip") ){
20789	openMode = SHELL_OPEN_ZIPFILE;
	@@ -20801,11 +20696,11 @@
20801	openMode = SHELL_OPEN_HEXDB;
20802	}else if( optionMatch(z, "maxsize") && iName+1<nArg ){
20803	p->szMax = integerValue(azArg[++iName]);
20804	#endif /* SQLITE_OMIT_DESERIALIZE */
20805	}else
20806	#endif /* !SQLITE_SHELL_FIDDLE */
20807	if( z[0]=='-' ){
20808	utf8_printf(stderr, "unknown option: %s\n", z);
20809	rc = 1;
20810	goto meta_command_exit;
20811	}else if( zFN ){
	@@ -20829,11 +20724,11 @@
20829	p->szMax = 0;
20830
20831	/* If a filename is specified, try to open it first */
20832	if( zFN \|\| p->openMode==SHELL_OPEN_HEXDB ){
20833	if( newFlag && zFN && !p->bSafeMode ) shellDeleteFile(zFN);
20834	#ifndef SQLITE_SHELL_FIDDLE
20835	if( p->bSafeMode
20836	&& p->openMode!=SHELL_OPEN_HEXDB
20837	&& zFN
20838	&& strcmp(zFN,":memory:")!=0
20839	){
	@@ -20862,11 +20757,11 @@
20862	p->pAuxDb->zDbFilename = 0;
20863	open_db(p, 0);
20864	}
20865	}else
20866
20867	#ifndef SQLITE_SHELL_FIDDLE
20868	if( (c=='o'
20869	&& (strncmp(azArg[0], "output", n)==0\|\|strncmp(azArg[0], "once", n)==0))
20870	\|\| (c=='e' && n==5 && strcmp(azArg[0],"excel")==0)
20871	){
20872	char *zFile = 0;
	@@ -20978,11 +20873,11 @@
20978	sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
20979	}
20980	}
20981	sqlite3_free(zFile);
20982	}else
20983	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
20984
20985	if( c=='p' && n>=3 && strncmp(azArg[0], "parameter", n)==0 ){
20986	open_db(p,0);
20987	if( nArg<=1 ) goto parameter_syntax_error;
20988
	@@ -21148,17 +21043,17 @@
21148	if( nArg >= 3) {
21149	strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
21150	}
21151	}else
21152
21153	#ifndef SQLITE_SHELL_FIDDLE
21154	if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
21155	rc = 2;
21156	}else
21157	#endif
21158
21159	#ifndef SQLITE_SHELL_FIDDLE
21160	if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
21161	FILE *inSaved = p->in;
21162	int savedLineno = p->lineno;
21163	failIfSafeMode(p, "cannot run .read in safe mode");
21164	if( nArg!=2 ){
	@@ -21189,13 +21084,13 @@
21189	fclose(p->in);
21190	}
21191	p->in = inSaved;
21192	p->lineno = savedLineno;
21193	}else
21194	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
21195
21196	#ifndef SQLITE_SHELL_FIDDLE
21197	if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
21198	const char *zSrcFile;
21199	const char *zDb;
21200	sqlite3 *pSrc;
21201	sqlite3_backup *pBackup;
	@@ -21243,11 +21138,11 @@
21243	utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
21244	rc = 1;
21245	}
21246	close_db(pSrc);
21247	}else
21248	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
21249
21250	if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
21251	if( nArg==2 ){
21252	p->scanstatsOn = (u8)booleanValue(azArg[1]);
21253	#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
	@@ -21869,11 +21764,11 @@
21869	shell_exec(p, zSql, 0);
21870	}
21871	sqlite3_free(zSql);
21872	}else
21873
21874	#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE)
21875	if( c=='s'
21876	&& (strncmp(azArg[0], "shell", n)==0 \|\| strncmp(azArg[0],"system",n)==0)
21877	){
21878	char *zCmd;
21879	int i, x;
	@@ -21890,11 +21785,11 @@
21890	}
21891	x = zCmd!=0 ? system(zCmd) : 1;
21892	sqlite3_free(zCmd);
21893	if( x ) raw_printf(stderr, "System command returns %d\n", x);
21894	}else
21895	#endif /* !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_FIDDLE) */
21896
21897	if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
21898	static const char *azBool[] = { "off", "on", "trigger", "full"};
21899	const char *zOut;
21900	int i;
	@@ -22070,11 +21965,11 @@
22070
22071	for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
22072	sqlite3_free(azResult);
22073	}else
22074
22075	#ifndef SQLITE_SHELL_FIDDLE
22076	/* Begin redirecting output to the file "testcase-out.txt" */
22077	if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
22078	output_reset(p);
22079	p->out = output_file_open("testcase-out.txt", 0);
22080	if( p->out==0 ){
	@@ -22084,11 +21979,11 @@
22084	sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
22085	}else{
22086	sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
22087	}
22088	}else
22089	#endif /* !defined(SQLITE_SHELL_FIDDLE) */
22090
22091	#ifndef SQLITE_UNTESTABLE
22092	if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 ){
22093	static const struct {
22094	const char zCtrlName; / Name of a test-control option */
	@@ -22756,11 +22651,11 @@
22756
22757	static void echo_group_input(ShellState p, const char zDo){
22758	if( ShellHasFlag(p, SHFLG_Echo) ) utf8_printf(p->out, "%s\n", zDo);
22759	}
22760
22761	#ifdef SQLITE_SHELL_FIDDLE
22762	/*
22763	** Alternate one_input_line() impl for wasm mode. This is not in the primary impl
22764	** because we need the global shellState and cannot access it from that function
22765	** without moving lots of code around (creating a larger/messier diff).
22766	*/
	@@ -22787,11 +22682,11 @@
22787	shell_check_oom(zLine);
22788	memcpy(zLine, zBegin, (size_t)nZ);
22789	zLine[nZ] = 0;
22790	return zLine;
22791	}
22792	#endif /* SQLITE_SHELL_FIDDLE */
22793
22794	/*
22795	** Read input from in and process it. If in==0 then input
22796	** is interactive - the user is typing it it. Otherwise, input
22797	** is coming from a file or device. A prompt is issued and history
	@@ -23170,11 +23065,11 @@
23170	# else
23171	# define SQLITE_SHELL_IS_UTF8 (1)
23172	# endif
23173	#endif
23174
23175	#ifdef SQLITE_SHELL_FIDDLE
23176	# define main fiddle_main
23177	#endif
23178
23179	#if SQLITE_SHELL_IS_UTF8
23180	int SQLITE_CDECL main(int argc, char **argv){
	@@ -23184,11 +23079,11 @@
23184	#endif
23185	#ifdef SQLITE_DEBUG
23186	sqlite3_int64 mem_main_enter = sqlite3_memory_used();
23187	#endif
23188	char *zErrMsg = 0;
23189	#ifdef SQLITE_SHELL_FIDDLE
23190	# define data shellState
23191	#else
23192	ShellState data;
23193	#endif
23194	const char *zInitFile = 0;
	@@ -23204,11 +23099,11 @@
23204	int argcToFree = 0;
23205	#endif
23206
23207	setBinaryMode(stdin, 0);
23208	setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
23209	#ifdef SQLITE_SHELL_FIDDLE
23210	stdin_is_interactive = 0;
23211	stdout_is_console = 1;
23212	#else
23213	stdin_is_interactive = isatty(0);
23214	stdout_is_console = isatty(1);
	@@ -23466,11 +23361,11 @@
23466	utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
23467	return 1;
23468	#endif
23469	}
23470	data.out = stdout;
23471	#ifndef SQLITE_SHELL_FIDDLE
23472	sqlite3_appendvfs_init(0,0,0);
23473	#endif
23474
23475	/* Go ahead and open the database file if it already exists. If the
23476	** file does not exist, delay opening it. This prevents empty database
	@@ -23734,11 +23629,11 @@
23734	}else{
23735	data.in = stdin;
23736	rc = process_input(&data);
23737	}
23738	}
23739	#ifndef SQLITE_SHELL_FIDDLE
23740	/* In WASM mode we have to leave the db state in place so that
23741	** client code can "push" SQL into it after this call returns. */
23742	free(azCmd);
23743	set_table_name(&data, 0);
23744	if( data.db ){
	@@ -23769,16 +23664,16 @@
23769	if( sqlite3_memory_used()>mem_main_enter ){
23770	utf8_printf(stderr, "Memory leaked: %u bytes\n",
23771	(unsigned int)(sqlite3_memory_used()-mem_main_enter));
23772	}
23773	#endif
23774	#endif /* !SQLITE_SHELL_FIDDLE */
23775	return rc;
23776	}
23777
23778
23779	#ifdef SQLITE_SHELL_FIDDLE
23780	/* Only for emcc experimentation purposes. */
23781	int fiddle_experiment(int a,int b){
23782	return a + b;
23783	}
23784
	@@ -23895,6 +23790,6 @@
23895	shellState.wasm.zPos = zSql;
23896	process_input(&shellState);
23897	memset(&shellState.wasm, 0, sizeof(shellState.wasm));
23898	}
23899	}
23900	#endif /* SQLITE_SHELL_FIDDLE */
23901

	--- extsrc/shell.c
	+++ extsrc/shell.c
	@@ -53,19 +53,10 @@
53	*/
54	#if !defined(SQLITE_OS_WINRT)
55	# define SQLITE_OS_WINRT 0
56	#endif
57









58	/*
59	** Warning pragmas copied from msvc.h in the core.
60	*/
61	#if defined(_MSC_VER)
62	#pragma warning(disable : 4054)
	@@ -254,10 +245,21 @@
245	#else
246	# define setBinaryMode(X,Y)
247	# define setTextMode(X,Y)
248	#endif
249
250	/*
251	** When compiling with emcc (a.k.a. emscripten), we're building a
252	** WebAssembly (WASM) bundle and need to disable and rewire a few
253	** things.
254	*/
255	#ifdef __EMSCRIPTEN__
256	#define SQLITE_SHELL_WASM_MODE
257	#else
258	#undef SQLITE_SHELL_WASM_MODE
259	#endif
260
261	/* True if the timer is enabled */
262	static int enableTimer = 0;
263
264	/* Return the current wall-clock time */
265	static sqlite3_int64 timeOfDay(void){
	@@ -715,11 +717,11 @@
717	**
718	** The result is stored in space obtained from malloc() and must either
719	** be freed by the caller or else passed back into this routine via the
720	** zPrior argument for reuse.
721	*/
722	#ifndef SQLITE_SHELL_WASM_MODE
723	static char one_input_line(FILE in, char *zPrior, int isContinuation){
724	char *zPrompt;
725	char *zResult;
726	if( in!=0 ){
727	zResult = local_getline(zPrior, in);
	@@ -735,11 +737,11 @@
737	if( zResult && *zResult ) shell_add_history(zResult);
738	#endif
739	}
740	return zResult;
741	}
742	#endif /* !SQLITE_SHELL_WASM_MODE */
743
744	/*
745	** Return the value of a hexadecimal digit. Return -1 if the input
746	** is not a hex digit.
747	*/
	@@ -3792,11 +3794,10 @@
3794	#define re_compile sqlite3re_compile
3795	#define re_free sqlite3re_free
3796
3797	/* The end-of-input character */
3798	#define RE_EOF 0 /* End of input */

3799
3800	/* The NFA is implemented as sequence of opcodes taken from the following
3801	** set. Each opcode has a single integer argument.
3802	*/
3803	#define RE_OP_MATCH 1 /* Match the one character in the argument */
	@@ -3814,37 +3815,10 @@
3815	#define RE_OP_DIGIT 13 /* digit: [0-9] */
3816	#define RE_OP_NOTDIGIT 14 /* Not a digit */
3817	#define RE_OP_SPACE 15 /* space: [ \t\n\r\v\f] */
3818	#define RE_OP_NOTSPACE 16 /* Not a digit */
3819	#define RE_OP_BOUNDARY 17 /* Boundary between word and non-word */



























3820
3821	/* Each opcode is a "state" in the NFA */
3822	typedef unsigned short ReStateNumber;
3823
3824	/* Because this is an NFA and not a DFA, multiple states can be active at
	@@ -3875,11 +3849,11 @@
3849	const char zErr; / Error message to return */
3850	char aOp; / Operators for the virtual machine */
3851	int aArg; / Arguments to each operator */
3852	unsigned (xNextChar)(ReInput); /* Next character function */
3853	unsigned char zInit[12]; /* Initial text to match */
3854	int nInit; /* Number of characters in zInit */
3855	unsigned nState; /* Number of entries in aOp[] and aArg[] */
3856	unsigned nAlloc; /* Slots allocated for aOp[] and aArg[] */
3857	};
3858
3859	/* Add a state to the given state set if it is not already there */
	@@ -3948,11 +3922,11 @@
3922	ReStateSet aStateSet[2], pThis, pNext;
3923	ReStateNumber aSpace[100];
3924	ReStateNumber *pToFree;
3925	unsigned int i = 0;
3926	unsigned int iSwap = 0;
3927	int c = RE_EOF+1;
3928	int cPrev = 0;
3929	int rc = 0;
3930	ReInput in;
3931
3932	in.z = zIn;
	@@ -3967,11 +3941,10 @@
3941	strncmp((const char)zIn+in.i, (const char)pRe->zInit, pRe->nInit)!=0)
3942	){
3943	in.i++;
3944	}
3945	if( in.i+pRe->nInit>in.mx ) return 0;

3946	}
3947
3948	if( pRe->nState<=(sizeof(aSpace)/(sizeof(aSpace[0])*2)) ){
3949	pToFree = 0;
3950	aStateSet[0].aState = aSpace;
	@@ -3996,14 +3969,10 @@
3969	switch( pRe->aOp[x] ){
3970	case RE_OP_MATCH: {
3971	if( pRe->aArg[x]==c ) re_add_state(pNext, x+1);
3972	break;
3973	}




3974	case RE_OP_ANY: {
3975	if( c!=0 ) re_add_state(pNext, x+1);
3976	break;
3977	}
3978	case RE_OP_WORD: {
	@@ -4081,13 +4050,11 @@
4050	}
4051	}
4052	}
4053	}
4054	for(i=0; i<pNext->nState; i++){
4055	if( pRe->aOp[pNext->aState[i]]==RE_OP_ACCEPT ){ rc = 1; break; }


4056	}
4057	re_match_end:
4058	sqlite3_free(pToFree);
4059	return rc;
4060	}
	@@ -4238,10 +4205,11 @@
4205	const char *zErr;
4206	while( (c = p->xNextChar(&p->sIn))!=0 ){
4207	iStart = p->nState;
4208	switch( c ){
4209	case '\|':
4210	case '$':
4211	case ')': {
4212	p->sIn.i--;
4213	return 0;
4214	}
4215	case '(': {
	@@ -4274,18 +4242,10 @@
4242	case '?': {
4243	if( iPrev<0 ) return "'?' without operand";
4244	re_insert(p, iPrev, RE_OP_FORK, p->nState - iPrev+1);
4245	break;
4246	}








4247	case '{': {
4248	int m = 0, n = 0;
4249	int sz, j;
4250	if( iPrev<0 ) return "'{m,n}' without operand";
4251	while( (c=rePeek(p))>='0' && c<='9' ){ m = m*10 + c - '0'; p->sIn.i++; }
	@@ -4300,11 +4260,10 @@
4260	p->sIn.i++;
4261	sz = p->nState - iPrev;
4262	if( m==0 ){
4263	if( n==0 ) return "both m and n are zero in '{m,n}'";
4264	re_insert(p, iPrev, RE_OP_FORK, sz+1);

4265	n--;
4266	}else{
4267	for(j=1; j<m; j++) re_copy(p, iPrev, sz);
4268	}
4269	for(j=m; j<n; j++){
	@@ -4419,11 +4378,15 @@
4378	zErr = re_subcompile_re(pRe);
4379	if( zErr ){
4380	re_free(pRe);
4381	return zErr;
4382	}
4383	if( rePeek(pRe)=='$' && pRe->sIn.i+1>=pRe->sIn.mx ){
4384	re_append(pRe, RE_OP_MATCH, RE_EOF);
4385	re_append(pRe, RE_OP_ACCEPT, 0);
4386	*ppRe = pRe;
4387	}else if( pRe->sIn.i>=pRe->sIn.mx ){
4388	re_append(pRe, RE_OP_ACCEPT, 0);
4389	*ppRe = pRe;
4390	}else{
4391	re_free(pRe);
4392	return "unrecognized character";
	@@ -4502,71 +4465,10 @@
4465	}
4466	if( setAux ){
4467	sqlite3_set_auxdata(context, 0, pRe, (void()(void))re_free);
4468	}
4469	}





























































4470
4471	/*
4472	** Invoke this routine to register the regexp() function with the
4473	** SQLite database connection.
4474	*/
	@@ -4588,23 +4490,16 @@
4490	/* The regexpi(PATTERN,STRING) function is a case-insensitive version
4491	** of regexp(PATTERN,STRING). */
4492	rc = sqlite3_create_function(db, "regexpi", 2,
4493	SQLITE_UTF8\|SQLITE_INNOCUOUS\|SQLITE_DETERMINISTIC,
4494	(void*)db, re_sql_func, 0, 0);







4495	}
4496	return rc;
4497	}
4498
4499	/*********************** End ../ext/misc/regexp.c ******************/
4500	#ifndef SQLITE_SHELL_WASM_MODE
4501	/*********************** Begin ../ext/misc/fileio.c ****************/
4502	/*
4503	** 2014-06-13
4504	**
4505	** The author disclaims copyright to this source code. In place of
	@@ -12353,19 +12248,19 @@
12248	int nIndent; /* Size of array aiIndent[] */
12249	int iIndent; /* Index of current op in aiIndent[] */
12250	char zNonce; / Nonce for temporary safe-mode excapes */
12251	EQPGraph sGraph; /* Information for the graphical EXPLAIN QUERY PLAN */
12252	ExpertInfo expert; /* Valid if previous command was ".expert OPT..." */
12253	#ifdef SQLITE_SHELL_WASM_MODE
12254	struct {
12255	const char * zInput; /* Input string from wasm/JS proxy */
12256	const char * zPos; /* Cursor pos into zInput */
12257	} wasm;
12258	#endif
12259	};
12260
12261	#ifdef SQLITE_SHELL_WASM_MODE
12262	static ShellState shellState;
12263	#endif
12264
12265
12266	/* Allowed values for ShellState.autoEQP
	@@ -13029,11 +12924,11 @@
12924	UNUSED_PARAMETER(zA2);
12925	UNUSED_PARAMETER(zA3);
12926	UNUSED_PARAMETER(zA4);
12927	switch( op ){
12928	case SQLITE_ATTACH: {
12929	#ifndef SQLITE_SHELL_WASM_MODE
12930	/* In WASM builds the filesystem is a virtual sandbox, so
12931	** there's no harm in using ATTACH. */
12932	failIfSafeMode(p, "cannot run ATTACH in safe mode");
12933	#endif
12934	break;
	@@ -15443,11 +15338,11 @@
15338	** There must be two or more spaces between the end of the command and the
15339	** start of the description of what that command does.
15340	*/
15341	static const char *(azHelp[]) = {
15342	#if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE) \
15343	&& !defined(SQLITE_SHELL_WASM_MODE)
15344	".archive ... Manage SQL archives",
15345	" Each command must have exactly one of the following options:",
15346	" -c, --create Create a new archive",
15347	" -u, --update Add or update files with changed mtime",
15348	" -i, --insert Like -u but always add even if unchanged",
	@@ -15469,23 +15364,23 @@
15364	" http://sqlite.org/cli.html#sqlite_archive_support",
15365	#endif
15366	#ifndef SQLITE_OMIT_AUTHORIZATION
15367	".auth ON\|OFF Show authorizer callbacks",
15368	#endif
15369	#ifndef SQLITE_SHELL_WASM_MODE
15370	".backup ?DB? FILE Backup DB (default \"main\") to FILE",
15371	" Options:",
15372	" --append Use the appendvfs",
15373	" --async Write to FILE without journal and fsync()",
15374	#endif
15375	".bail on\|off Stop after hitting an error. Default OFF",
15376	".binary on\|off Turn binary output on or off. Default OFF",
15377	#ifndef SQLITE_SHELL_WASM_MODE
15378	".cd DIRECTORY Change the working directory to DIRECTORY",
15379	#endif
15380	".changes on\|off Show number of rows changed by SQL",
15381	#ifndef SQLITE_SHELL_WASM_MODE
15382	".check GLOB Fail if output since .testcase does not match",
15383	".clone NEWDB Clone data into NEWDB from the existing database",
15384	#endif
15385	".connection [close] [#] Open or close an auxiliary database connection",
15386	".databases List names and files of attached databases",
	@@ -15507,15 +15402,15 @@
15402	#ifdef SQLITE_DEBUG
15403	" test Show raw EXPLAIN QUERY PLAN output",
15404	" trace Like \"full\" but enable \"PRAGMA vdbe_trace\"",
15405	#endif
15406	" trigger Like \"full\" but also show trigger bytecode",
15407	#ifndef SQLITE_SHELL_WASM_MODE
15408	".excel Display the output of next command in spreadsheet",
15409	" --bom Put a UTF8 byte-order mark on intermediate file",
15410	#endif
15411	#ifndef SQLITE_SHELL_WASM_MODE
15412	".exit ?CODE? Exit this program with return-code CODE",
15413	#endif
15414	".expert EXPERIMENTAL. Suggest indexes for queries",
15415	".explain ?on\|off\|auto? Change the EXPLAIN formatting mode. Default: auto",
15416	".filectrl CMD ... Run various sqlite3_file_control() operations",
	@@ -15522,11 +15417,11 @@
15417	" --schema SCHEMA Use SCHEMA instead of \"main\"",
15418	" --help Show CMD details",
15419	".fullschema ?--indent? Show schema and the content of sqlite_stat tables",
15420	".headers on\|off Turn display of headers on or off",
15421	".help ?-all? ?PATTERN? Show help text for PATTERN",
15422	#ifndef SQLITE_SHELL_WASM_MODE
15423	".import FILE TABLE Import data from FILE into TABLE",
15424	" Options:",
15425	" --ascii Use \\037 and \\036 as column and row separators",
15426	" --csv Use , and \\n as column and row separators",
15427	" --skip N Skip the first N rows of input",
	@@ -15551,14 +15446,14 @@
15446	#endif
15447	".limit ?LIMIT? ?VAL? Display or change the value of an SQLITE_LIMIT",
15448	".lint OPTIONS Report potential schema issues.",
15449	" Options:",
15450	" fkey-indexes Find missing foreign key indexes",
15451	#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_WASM_MODE)
15452	".load FILE ?ENTRY? Load an extension library",
15453	#endif
15454	#ifndef SQLITE_SHELL_WASM_MODE
15455	".log FILE\|off Turn logging on or off. FILE can be stderr/stdout",
15456	#endif
15457	".mode MODE ?OPTIONS? Set output mode",
15458	" MODE is one of:",
15459	" ascii Columns/rows delimited by 0x1F and 0x1E",
	@@ -15581,15 +15476,15 @@
15476	" --wordwrap B Wrap or not at word boundaries per B (on/off)",
15477	" --ww Shorthand for \"--wordwrap 1\"",
15478	" --quote Quote output text as SQL literals",
15479	" --noquote Do not quote output text",
15480	" TABLE The name of SQL table used for \"insert\" mode",
15481	#ifndef SQLITE_SHELL_WASM_MODE
15482	".nonce STRING Suspend safe mode for one command if nonce matches",
15483	#endif
15484	".nullvalue STRING Use STRING in place of NULL values",
15485	#ifndef SQLITE_SHELL_WASM_MODE
15486	".once ?OPTIONS? ?FILE? Output for the next SQL command only to FILE",
15487	" If FILE begins with '\|' then open as a pipe",
15488	" --bom Put a UTF8 byte-order mark at the beginning",
15489	" -e Send output to the system text editor",
15490	" -x Send output as CSV to a spreadsheet (same as \".excel\")",
	@@ -15607,11 +15502,11 @@
15502	#endif
15503	" --new Initialize FILE to an empty database",
15504	" --nofollow Do not follow symbolic links",
15505	" --readonly Open FILE readonly",
15506	" --zip FILE is a ZIP archive",
15507	#ifndef SQLITE_SHELL_WASM_MODE
15508	".output ?FILE? Send output to FILE or stdout if FILE is omitted",
15509	" If FILE begins with '\|' then open it as a pipe.",
15510	" Options:",
15511	" --bom Prefix output with a UTF8 byte-order mark",
15512	" -e Send output to the system text editor",
	@@ -15631,11 +15526,11 @@
15526	" --once Do no more than one progress interrupt",
15527	" --quiet\|-q No output except at interrupts",
15528	" --reset Reset the count for each input and interrupt",
15529	#endif
15530	".prompt MAIN CONTINUE Replace the standard prompts",
15531	#ifndef SQLITE_SHELL_WASM_MODE
15532	".quit Exit this program",
15533	".read FILE Read input from FILE or command output",
15534	" If FILE begins with \"\|\", it is a command that generates the input.",
15535	#endif
15536	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
	@@ -15644,11 +15539,11 @@
15539	" --recovery-db NAME Store recovery metadata in database file NAME",
15540	" --lost-and-found TABLE Alternative name for the lost-and-found table",
15541	" --no-rowids Do not attempt to recover rowid values",
15542	" that are not also INTEGER PRIMARY KEYs",
15543	#endif
15544	#ifndef SQLITE_SHELL_WASM_MODE
15545	".restore ?DB? FILE Restore content of DB (default \"main\") from FILE",
15546	".save ?OPTIONS? FILE Write database to FILE (an alias for .backup ...)",
15547	#endif
15548	".scanstats on\|off Turn sqlite3_stmt_scanstatus() metrics on or off",
15549	".schema ?PATTERN? Show the CREATE statements matching PATTERN",
	@@ -15681,24 +15576,24 @@
15576	" --sha3-224 Use the sha3-224 algorithm",
15577	" --sha3-256 Use the sha3-256 algorithm (default)",
15578	" --sha3-384 Use the sha3-384 algorithm",
15579	" --sha3-512 Use the sha3-512 algorithm",
15580	" Any other argument is a LIKE pattern for tables to hash",
15581	#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
15582	".shell CMD ARGS... Run CMD ARGS... in a system shell",
15583	#endif
15584	".show Show the current values for various settings",
15585	".stats ?ARG? Show stats or turn stats on or off",
15586	" off Turn off automatic stat display",
15587	" on Turn on automatic stat display",
15588	" stmt Show statement stats",
15589	" vmstep Show the virtual machine step count only",
15590	#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
15591	".system CMD ARGS... Run CMD ARGS... in a system shell",
15592	#endif
15593	".tables ?TABLE? List names of tables matching LIKE pattern TABLE",
15594	#ifndef SQLITE_SHELL_WASM_MODE
15595	".testcase NAME Begin redirecting output to 'testcase-out.txt'",
15596	#endif
15597	".testctrl CMD ... Run various sqlite3_test_control() operations",
15598	" Run \".testctrl\" with no arguments for details",
15599	".timeout MS Try opening locked tables for MS milliseconds",
	@@ -16247,11 +16142,11 @@
16142	sqlite3_uint_init(p->db, 0, 0);
16143	sqlite3_decimal_init(p->db, 0, 0);
16144	sqlite3_regexp_init(p->db, 0, 0);
16145	sqlite3_ieee_init(p->db, 0, 0);
16146	sqlite3_series_init(p->db, 0, 0);
16147	#ifndef SQLITE_SHELL_WASM_MODE
16148	sqlite3_fileio_init(p->db, 0, 0);
16149	sqlite3_completion_init(p->db, 0, 0);
16150	#endif
16151	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
16152	sqlite3_dbdata_init(p->db, 0, 0);
	@@ -19377,19 +19272,19 @@
19272	}
19273	}else
19274	#endif
19275
19276	#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) \
19277	&& !defined(SQLITE_SHELL_WASM_MODE)
19278	if( c=='a' && strncmp(azArg[0], "archive", n)==0 ){
19279	open_db(p, 0);
19280	failIfSafeMode(p, "cannot run .archive in safe mode");
19281	rc = arDotCommand(p, 0, azArg, nArg);
19282	}else
19283	#endif
19284
19285	#ifndef SQLITE_SHELL_WASM_MODE
19286	if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
19287	\|\| (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
19288	){
19289	const char *zDestFile = 0;
19290	const char *zDb = 0;
	@@ -19454,11 +19349,11 @@
19349	utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
19350	rc = 1;
19351	}
19352	close_db(pDest);
19353	}else
19354	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19355
19356	if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
19357	if( nArg==2 ){
19358	bail_on_error = booleanValue(azArg[1]);
19359	}else{
	@@ -19485,11 +19380,11 @@
19380	*/
19381	if( c=='b' && n>=3 && strncmp(azArg[0], "breakpoint", n)==0 ){
19382	test_breakpoint();
19383	}else
19384
19385	#ifndef SQLITE_SHELL_WASM_MODE
19386	if( c=='c' && strcmp(azArg[0],"cd")==0 ){
19387	failIfSafeMode(p, "cannot run .cd in safe mode");
19388	if( nArg==2 ){
19389	#if defined(_WIN32) \|\| defined(WIN32)
19390	wchar_t *z = sqlite3_win32_utf8_to_unicode(azArg[1]);
	@@ -19505,11 +19400,11 @@
19400	}else{
19401	raw_printf(stderr, "Usage: .cd DIRECTORY\n");
19402	rc = 1;
19403	}
19404	}else
19405	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19406
19407	if( c=='c' && n>=3 && strncmp(azArg[0], "changes", n)==0 ){
19408	if( nArg==2 ){
19409	setOrClearFlag(p, SHFLG_CountChanges, azArg[1]);
19410	}else{
	@@ -19516,11 +19411,11 @@
19411	raw_printf(stderr, "Usage: .changes on\|off\n");
19412	rc = 1;
19413	}
19414	}else
19415
19416	#ifndef SQLITE_SHELL_WASM_MODE
19417	/* Cancel output redirection, if it is currently set (by .testcase)
19418	** Then read the content of the testcase-out.txt file and compare against
19419	** azArg[1]. If there are differences, report an error and exit.
19420	*/
19421	if( c=='c' && n>=3 && strncmp(azArg[0], "check", n)==0 ){
	@@ -19541,23 +19436,23 @@
19436	utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
19437	p->nCheck++;
19438	}
19439	sqlite3_free(zRes);
19440	}else
19441	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19442
19443	#ifndef SQLITE_SHELL_WASM_MODE
19444	if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
19445	failIfSafeMode(p, "cannot run .clone in safe mode");
19446	if( nArg==2 ){
19447	tryToClone(p, azArg[1]);
19448	}else{
19449	raw_printf(stderr, "Usage: .clone FILENAME\n");
19450	rc = 1;
19451	}
19452	}else
19453	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
19454
19455	if( c=='c' && strncmp(azArg[0], "connection", n)==0 ){
19456	if( nArg==1 ){
19457	/* List available connections */
19458	int i;
	@@ -19842,11 +19737,11 @@
19737	raw_printf(stderr, "Usage: .eqp off\|on\|trace\|trigger\|full\n");
19738	rc = 1;
19739	}
19740	}else
19741
19742	#ifndef SQLITE_SHELL_WASM_MODE
19743	if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
19744	if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
19745	rc = 2;
19746	}else
19747	#endif
	@@ -20102,11 +19997,11 @@
19997	}else{
19998	showHelp(p->out, 0);
19999	}
20000	}else
20001
20002	#ifndef SQLITE_SHELL_WASM_MODE
20003	if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
20004	char zTable = 0; / Insert data into this table */
20005	char zSchema = 0; / within this schema (may default to "main") */
20006	char zFile = 0; / Name of file to extra content from */
20007	sqlite3_stmt pStmt = NULL; / A statement */
	@@ -20393,11 +20288,11 @@
20288	utf8_printf(p->out,
20289	"Added %d rows with %d errors using %d lines of input\n",
20290	sCtx.nRow, sCtx.nErr, sCtx.nLine-1);
20291	}
20292	}else
20293	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
20294
20295	#ifndef SQLITE_UNTESTABLE
20296	if( c=='i' && strncmp(azArg[0], "imposter", n)==0 ){
20297	char *zSql;
20298	char *zCollist = 0;
	@@ -20583,11 +20478,11 @@
20478	if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
20479	open_db(p, 0);
20480	lintDotCommand(p, azArg, nArg);
20481	}else
20482
20483	#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_WASM_MODE)
20484	if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
20485	const char zFile, zProc;
20486	char *zErrMsg = 0;
20487	failIfSafeMode(p, "cannot run .load in safe mode");
20488	if( nArg<2 ){
	@@ -20605,11 +20500,11 @@
20500	rc = 1;
20501	}
20502	}else
20503	#endif
20504
20505	#ifndef SQLITE_SHELL_WASM_MODE
20506	if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
20507	failIfSafeMode(p, "cannot run .log in safe mode");
20508	if( nArg!=2 ){
20509	raw_printf(stderr, "Usage: .log FILENAME\n");
20510	rc = 1;
	@@ -20742,11 +20637,11 @@
20637	rc = 1;
20638	}
20639	p->cMode = p->mode;
20640	}else
20641
20642	#ifndef SQLITE_SHELL_WASM_MODE
20643	if( c=='n' && strcmp(azArg[0], "nonce")==0 ){
20644	if( nArg!=2 ){
20645	raw_printf(stderr, "Usage: .nonce NONCE\n");
20646	rc = 1;
20647	}else if( p->zNonce==0 \|\| strcmp(azArg[1],p->zNonce)!=0 ){
	@@ -20757,11 +20652,11 @@
20652	p->bSafeMode = 0;
20653	return 0; /* Return immediately to bypass the safe mode reset
20654	** at the end of this procedure */
20655	}
20656	}else
20657	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
20658
20659	if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
20660	if( nArg==2 ){
20661	sqlite3_snprintf(sizeof(p->nullValue), p->nullValue,
20662	"%.*s", (int)ArraySize(p->nullValue)-1, azArg[1]);
	@@ -20779,11 +20674,11 @@
20674	int openMode = SHELL_OPEN_UNSPEC;
20675
20676	/* Check for command-line arguments */
20677	for(iName=1; iName<nArg; iName++){
20678	const char *z = azArg[iName];
20679	#ifndef SQLITE_SHELL_WASM_MODE
20680	if( optionMatch(z,"new") ){
20681	newFlag = 1;
20682	#ifdef SQLITE_HAVE_ZLIB
20683	}else if( optionMatch(z, "zip") ){
20684	openMode = SHELL_OPEN_ZIPFILE;
	@@ -20801,11 +20696,11 @@
20696	openMode = SHELL_OPEN_HEXDB;
20697	}else if( optionMatch(z, "maxsize") && iName+1<nArg ){
20698	p->szMax = integerValue(azArg[++iName]);
20699	#endif /* SQLITE_OMIT_DESERIALIZE */
20700	}else
20701	#endif /* !SQLITE_SHELL_WASM_MODE */
20702	if( z[0]=='-' ){
20703	utf8_printf(stderr, "unknown option: %s\n", z);
20704	rc = 1;
20705	goto meta_command_exit;
20706	}else if( zFN ){
	@@ -20829,11 +20724,11 @@
20724	p->szMax = 0;
20725
20726	/* If a filename is specified, try to open it first */
20727	if( zFN \|\| p->openMode==SHELL_OPEN_HEXDB ){
20728	if( newFlag && zFN && !p->bSafeMode ) shellDeleteFile(zFN);
20729	#ifndef SQLITE_SHELL_WASM_MODE
20730	if( p->bSafeMode
20731	&& p->openMode!=SHELL_OPEN_HEXDB
20732	&& zFN
20733	&& strcmp(zFN,":memory:")!=0
20734	){
	@@ -20862,11 +20757,11 @@
20757	p->pAuxDb->zDbFilename = 0;
20758	open_db(p, 0);
20759	}
20760	}else
20761
20762	#ifndef SQLITE_SHELL_WASM_MODE
20763	if( (c=='o'
20764	&& (strncmp(azArg[0], "output", n)==0\|\|strncmp(azArg[0], "once", n)==0))
20765	\|\| (c=='e' && n==5 && strcmp(azArg[0],"excel")==0)
20766	){
20767	char *zFile = 0;
	@@ -20978,11 +20873,11 @@
20873	sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
20874	}
20875	}
20876	sqlite3_free(zFile);
20877	}else
20878	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
20879
20880	if( c=='p' && n>=3 && strncmp(azArg[0], "parameter", n)==0 ){
20881	open_db(p,0);
20882	if( nArg<=1 ) goto parameter_syntax_error;
20883
	@@ -21148,17 +21043,17 @@
21043	if( nArg >= 3) {
21044	strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
21045	}
21046	}else
21047
21048	#ifndef SQLITE_SHELL_WASM_MODE
21049	if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
21050	rc = 2;
21051	}else
21052	#endif
21053
21054	#ifndef SQLITE_SHELL_WASM_MODE
21055	if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
21056	FILE *inSaved = p->in;
21057	int savedLineno = p->lineno;
21058	failIfSafeMode(p, "cannot run .read in safe mode");
21059	if( nArg!=2 ){
	@@ -21189,13 +21084,13 @@
21084	fclose(p->in);
21085	}
21086	p->in = inSaved;
21087	p->lineno = savedLineno;
21088	}else
21089	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
21090
21091	#ifndef SQLITE_SHELL_WASM_MODE
21092	if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
21093	const char *zSrcFile;
21094	const char *zDb;
21095	sqlite3 *pSrc;
21096	sqlite3_backup *pBackup;
	@@ -21243,11 +21138,11 @@
21138	utf8_printf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
21139	rc = 1;
21140	}
21141	close_db(pSrc);
21142	}else
21143	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
21144
21145	if( c=='s' && strncmp(azArg[0], "scanstats", n)==0 ){
21146	if( nArg==2 ){
21147	p->scanstatsOn = (u8)booleanValue(azArg[1]);
21148	#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
	@@ -21869,11 +21764,11 @@
21764	shell_exec(p, zSql, 0);
21765	}
21766	sqlite3_free(zSql);
21767	}else
21768
21769	#if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
21770	if( c=='s'
21771	&& (strncmp(azArg[0], "shell", n)==0 \|\| strncmp(azArg[0],"system",n)==0)
21772	){
21773	char *zCmd;
21774	int i, x;
	@@ -21890,11 +21785,11 @@
21785	}
21786	x = zCmd!=0 ? system(zCmd) : 1;
21787	sqlite3_free(zCmd);
21788	if( x ) raw_printf(stderr, "System command returns %d\n", x);
21789	}else
21790	#endif /* !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE) */
21791
21792	if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
21793	static const char *azBool[] = { "off", "on", "trigger", "full"};
21794	const char *zOut;
21795	int i;
	@@ -22070,11 +21965,11 @@
21965
21966	for(ii=0; ii<nRow; ii++) sqlite3_free(azResult[ii]);
21967	sqlite3_free(azResult);
21968	}else
21969
21970	#ifndef SQLITE_SHELL_WASM_MODE
21971	/* Begin redirecting output to the file "testcase-out.txt" */
21972	if( c=='t' && strcmp(azArg[0],"testcase")==0 ){
21973	output_reset(p);
21974	p->out = output_file_open("testcase-out.txt", 0);
21975	if( p->out==0 ){
	@@ -22084,11 +21979,11 @@
21979	sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "%s", azArg[1]);
21980	}else{
21981	sqlite3_snprintf(sizeof(p->zTestcase), p->zTestcase, "?");
21982	}
21983	}else
21984	#endif /* !defined(SQLITE_SHELL_WASM_MODE) */
21985
21986	#ifndef SQLITE_UNTESTABLE
21987	if( c=='t' && n>=8 && strncmp(azArg[0], "testctrl", n)==0 ){
21988	static const struct {
21989	const char zCtrlName; / Name of a test-control option */
	@@ -22756,11 +22651,11 @@
22651
22652	static void echo_group_input(ShellState p, const char zDo){
22653	if( ShellHasFlag(p, SHFLG_Echo) ) utf8_printf(p->out, "%s\n", zDo);
22654	}
22655
22656	#ifdef SQLITE_SHELL_WASM_MODE
22657	/*
22658	** Alternate one_input_line() impl for wasm mode. This is not in the primary impl
22659	** because we need the global shellState and cannot access it from that function
22660	** without moving lots of code around (creating a larger/messier diff).
22661	*/
	@@ -22787,11 +22682,11 @@
22682	shell_check_oom(zLine);
22683	memcpy(zLine, zBegin, (size_t)nZ);
22684	zLine[nZ] = 0;
22685	return zLine;
22686	}
22687	#endif /* SQLITE_SHELL_WASM_MODE */
22688
22689	/*
22690	** Read input from in and process it. If in==0 then input
22691	** is interactive - the user is typing it it. Otherwise, input
22692	** is coming from a file or device. A prompt is issued and history
	@@ -23170,11 +23065,11 @@
23065	# else
23066	# define SQLITE_SHELL_IS_UTF8 (1)
23067	# endif
23068	#endif
23069
23070	#ifdef SQLITE_SHELL_WASM_MODE
23071	# define main fiddle_main
23072	#endif
23073
23074	#if SQLITE_SHELL_IS_UTF8
23075	int SQLITE_CDECL main(int argc, char **argv){
	@@ -23184,11 +23079,11 @@
23079	#endif
23080	#ifdef SQLITE_DEBUG
23081	sqlite3_int64 mem_main_enter = sqlite3_memory_used();
23082	#endif
23083	char *zErrMsg = 0;
23084	#ifdef SQLITE_SHELL_WASM_MODE
23085	# define data shellState
23086	#else
23087	ShellState data;
23088	#endif
23089	const char *zInitFile = 0;
	@@ -23204,11 +23099,11 @@
23099	int argcToFree = 0;
23100	#endif
23101
23102	setBinaryMode(stdin, 0);
23103	setvbuf(stderr, 0, _IONBF, 0); /* Make sure stderr is unbuffered */
23104	#ifdef SQLITE_SHELL_WASM_MODE
23105	stdin_is_interactive = 0;
23106	stdout_is_console = 1;
23107	#else
23108	stdin_is_interactive = isatty(0);
23109	stdout_is_console = isatty(1);
	@@ -23466,11 +23361,11 @@
23361	utf8_printf(stderr,"%s: Error: no database filename specified\n", Argv0);
23362	return 1;
23363	#endif
23364	}
23365	data.out = stdout;
23366	#ifndef SQLITE_SHELL_WASM_MODE
23367	sqlite3_appendvfs_init(0,0,0);
23368	#endif
23369
23370	/* Go ahead and open the database file if it already exists. If the
23371	** file does not exist, delay opening it. This prevents empty database
	@@ -23734,11 +23629,11 @@
23629	}else{
23630	data.in = stdin;
23631	rc = process_input(&data);
23632	}
23633	}
23634	#ifndef SQLITE_SHELL_WASM_MODE
23635	/* In WASM mode we have to leave the db state in place so that
23636	** client code can "push" SQL into it after this call returns. */
23637	free(azCmd);
23638	set_table_name(&data, 0);
23639	if( data.db ){
	@@ -23769,16 +23664,16 @@
23664	if( sqlite3_memory_used()>mem_main_enter ){
23665	utf8_printf(stderr, "Memory leaked: %u bytes\n",
23666	(unsigned int)(sqlite3_memory_used()-mem_main_enter));
23667	}
23668	#endif
23669	#endif /* !SQLITE_SHELL_WASM_MODE */
23670	return rc;
23671	}
23672
23673
23674	#ifdef SQLITE_SHELL_WASM_MODE
23675	/* Only for emcc experimentation purposes. */
23676	int fiddle_experiment(int a,int b){
23677	return a + b;
23678	}
23679
	@@ -23895,6 +23790,6 @@
23790	shellState.wasm.zPos = zSql;
23791	process_input(&shellState);
23792	memset(&shellState.wasm, 0, sizeof(shellState.wasm));
23793	}
23794	}
23795	#endif /* SQLITE_SHELL_WASM_MODE */
23796

M extsrc/sqlite3.c

+212 -249

		--- 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.40.0. By combining all the individual C code files into this
	3	+** version 3.39.2. 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.
		@@ -450,13 +450,13 @@
450	450	**
451	451	** See also: [sqlite3_libversion()],
452	452	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453	453	** [sqlite_version()] and [sqlite_source_id()].
454	454	*/
455		-#define SQLITE_VERSION "3.40.0"
456		-#define SQLITE_VERSION_NUMBER 3040000
457		-#define SQLITE_SOURCE_ID "2022-07-18 19:32:30 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a"
	455	+#define SQLITE_VERSION "3.39.2"
	456	+#define SQLITE_VERSION_NUMBER 3039002
	457	+#define SQLITE_SOURCE_ID "2022-07-21 12:26:01 9141e873c575b049ce7aeaf313d05966f1966087caf33a6c80d2416a28571a21"
458	458
459	459	/*
460	460	** CAPI3REF: Run-Time Library Version Numbers
461	461	** KEYWORDS: sqlite3_version sqlite3_sourceid
462	462	**
		@@ -15553,67 +15553,67 @@
15553	15553	#define OP_Checkpoint 3
15554	15554	#define OP_JournalMode 4
15555	15555	#define OP_Vacuum 5
15556	15556	#define OP_VFilter 6 /* jump, synopsis: iplan=r[P3] zplan='P4' */
15557	15557	#define OP_VUpdate 7 /* synopsis: data=r[P3@P2] */
15558		-#define OP_Init 8 /* jump, synopsis: Start at P2 */
15559		-#define OP_Goto 9 /* jump */
15560		-#define OP_Gosub 10 /* jump */
15561		-#define OP_InitCoroutine 11 /* jump */
15562		-#define OP_Yield 12 /* jump */
15563		-#define OP_MustBeInt 13 /* jump */
15564		-#define OP_Jump 14 /* jump */
15565		-#define OP_Once 15 /* jump */
15566		-#define OP_If 16 /* jump */
15567		-#define OP_IfNot 17 /* jump */
15568		-#define OP_IsNullOrType 18 /* jump, synopsis: if typeof(r[P1]) IN (P3,5) goto P2 */
	15558	+#define OP_Goto 8 /* jump */
	15559	+#define OP_Gosub 9 /* jump */
	15560	+#define OP_InitCoroutine 10 /* jump */
	15561	+#define OP_Yield 11 /* jump */
	15562	+#define OP_MustBeInt 12 /* jump */
	15563	+#define OP_Jump 13 /* jump */
	15564	+#define OP_Once 14 /* jump */
	15565	+#define OP_If 15 /* jump */
	15566	+#define OP_IfNot 16 /* jump */
	15567	+#define OP_IsNullOrType 17 /* jump, synopsis: if typeof(r[P1]) IN (P3,5) goto P2 */
	15568	+#define OP_IfNullRow 18 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
15569	15569	#define OP_Not 19 /* same as TK_NOT, synopsis: r[P2]= !r[P1] */
15570		-#define OP_IfNullRow 20 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
15571		-#define OP_SeekLT 21 /* jump, synopsis: key=r[P3@P4] */
15572		-#define OP_SeekLE 22 /* jump, synopsis: key=r[P3@P4] */
15573		-#define OP_SeekGE 23 /* jump, synopsis: key=r[P3@P4] */
15574		-#define OP_SeekGT 24 /* jump, synopsis: key=r[P3@P4] */
15575		-#define OP_IfNotOpen 25 /* jump, synopsis: if( !csr[P1] ) goto P2 */
15576		-#define OP_IfNoHope 26 /* jump, synopsis: key=r[P3@P4] */
15577		-#define OP_NoConflict 27 /* jump, synopsis: key=r[P3@P4] */
15578		-#define OP_NotFound 28 /* jump, synopsis: key=r[P3@P4] */
15579		-#define OP_Found 29 /* jump, synopsis: key=r[P3@P4] */
15580		-#define OP_SeekRowid 30 /* jump, synopsis: intkey=r[P3] */
15581		-#define OP_NotExists 31 /* jump, synopsis: intkey=r[P3] */
15582		-#define OP_Last 32 /* jump */
15583		-#define OP_IfSmaller 33 /* jump */
15584		-#define OP_SorterSort 34 /* jump */
15585		-#define OP_Sort 35 /* jump */
15586		-#define OP_Rewind 36 /* jump */
15587		-#define OP_SorterNext 37 /* jump */
15588		-#define OP_Prev 38 /* jump */
15589		-#define OP_Next 39 /* jump */
15590		-#define OP_IdxLE 40 /* jump, synopsis: key=r[P3@P4] */
15591		-#define OP_IdxGT 41 /* jump, synopsis: key=r[P3@P4] */
15592		-#define OP_IdxLT 42 /* jump, synopsis: key=r[P3@P4] */
	15570	+#define OP_SeekLT 20 /* jump, synopsis: key=r[P3@P4] */
	15571	+#define OP_SeekLE 21 /* jump, synopsis: key=r[P3@P4] */
	15572	+#define OP_SeekGE 22 /* jump, synopsis: key=r[P3@P4] */
	15573	+#define OP_SeekGT 23 /* jump, synopsis: key=r[P3@P4] */
	15574	+#define OP_IfNotOpen 24 /* jump, synopsis: if( !csr[P1] ) goto P2 */
	15575	+#define OP_IfNoHope 25 /* jump, synopsis: key=r[P3@P4] */
	15576	+#define OP_NoConflict 26 /* jump, synopsis: key=r[P3@P4] */
	15577	+#define OP_NotFound 27 /* jump, synopsis: key=r[P3@P4] */
	15578	+#define OP_Found 28 /* jump, synopsis: key=r[P3@P4] */
	15579	+#define OP_SeekRowid 29 /* jump, synopsis: intkey=r[P3] */
	15580	+#define OP_NotExists 30 /* jump, synopsis: intkey=r[P3] */
	15581	+#define OP_Last 31 /* jump */
	15582	+#define OP_IfSmaller 32 /* jump */
	15583	+#define OP_SorterSort 33 /* jump */
	15584	+#define OP_Sort 34 /* jump */
	15585	+#define OP_Rewind 35 /* jump */
	15586	+#define OP_SorterNext 36 /* jump */
	15587	+#define OP_Prev 37 /* jump */
	15588	+#define OP_Next 38 /* jump */
	15589	+#define OP_IdxLE 39 /* jump, synopsis: key=r[P3@P4] */
	15590	+#define OP_IdxGT 40 /* jump, synopsis: key=r[P3@P4] */
	15591	+#define OP_IdxLT 41 /* jump, synopsis: key=r[P3@P4] */
	15592	+#define OP_IdxGE 42 /* jump, synopsis: key=r[P3@P4] */
15593	15593	#define OP_Or 43 /* same as TK_OR, synopsis: r[P3]=(r[P1] \|\| r[P2]) */
15594	15594	#define OP_And 44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
15595		-#define OP_IdxGE 45 /* jump, synopsis: key=r[P3@P4] */
15596		-#define OP_RowSetRead 46 /* jump, synopsis: r[P3]=rowset(P1) */
15597		-#define OP_RowSetTest 47 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
15598		-#define OP_Program 48 /* jump */
15599		-#define OP_FkIfZero 49 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
	15595	+#define OP_RowSetRead 45 /* jump, synopsis: r[P3]=rowset(P1) */
	15596	+#define OP_RowSetTest 46 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
	15597	+#define OP_Program 47 /* jump */
	15598	+#define OP_FkIfZero 48 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
	15599	+#define OP_IfPos 49 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
15600	15600	#define OP_IsNull 50 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
15601	15601	#define OP_NotNull 51 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
15602	15602	#define OP_Ne 52 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
15603	15603	#define OP_Eq 53 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
15604	15604	#define OP_Gt 54 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
15605	15605	#define OP_Le 55 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
15606	15606	#define OP_Lt 56 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
15607	15607	#define OP_Ge 57 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
15608	15608	#define OP_ElseEq 58 /* jump, same as TK_ESCAPE */
15609		-#define OP_IfPos 59 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
15610		-#define OP_IfNotZero 60 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
15611		-#define OP_DecrJumpZero 61 /* jump, synopsis: if (--r[P1])==0 goto P2 */
15612		-#define OP_IncrVacuum 62 /* jump */
15613		-#define OP_VNext 63 /* jump */
15614		-#define OP_Filter 64 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
	15609	+#define OP_IfNotZero 59 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
	15610	+#define OP_DecrJumpZero 60 /* jump, synopsis: if (--r[P1])==0 goto P2 */
	15611	+#define OP_IncrVacuum 61 /* jump */
	15612	+#define OP_VNext 62 /* jump */
	15613	+#define OP_Filter 63 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
	15614	+#define OP_Init 64 /* jump, synopsis: Start at P2 */
15615	15615	#define OP_PureFunc 65 /* synopsis: r[P3]=func(r[P2@NP]) */
15616	15616	#define OP_Function 66 /* synopsis: r[P3]=func(r[P2@NP]) */
15617	15617	#define OP_Return 67
15618	15618	#define OP_EndCoroutine 68
15619	15619	#define OP_HaltIfNull 69 /* synopsis: if r[P3]=null halt */
		@@ -15745,17 +15745,17 @@
15745	15745	#define OPFLG_IN3 0x08 /* in3: P3 is an input */
15746	15746	#define OPFLG_OUT2 0x10 /* out2: P2 is an output */
15747	15747	#define OPFLG_OUT3 0x20 /* out3: P3 is an output */
15748	15748	#define OPFLG_INITIALIZER {\
15749	15749	/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,\
15750		-/* 8 */ 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01,\
15751		-/* 16 */ 0x03, 0x03, 0x03, 0x12, 0x01, 0x09, 0x09, 0x09,\
15752		-/* 24 */ 0x09, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,\
	15750	+/* 8 */ 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, 0x03,\
	15751	+/* 16 */ 0x03, 0x03, 0x01, 0x12, 0x09, 0x09, 0x09, 0x09,\
	15752	+/* 24 */ 0x01, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x01,\
15753	15753	/* 32 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\
15754		-/* 40 */ 0x01, 0x01, 0x01, 0x26, 0x26, 0x01, 0x23, 0x0b,\
15755		-/* 48 */ 0x01, 0x01, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
15756		-/* 56 */ 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x03, 0x01, 0x01,\
	15754	+/* 40 */ 0x01, 0x01, 0x01, 0x26, 0x26, 0x23, 0x0b, 0x01,\
	15755	+/* 48 */ 0x01, 0x03, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
	15756	+/* 56 */ 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x01, 0x01, 0x01,\
15757	15757	/* 64 */ 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00, 0x10,\
15758	15758	/* 72 */ 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,\
15759	15759	/* 80 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02, 0x02,\
15760	15760	/* 88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x00, 0x00,\
15761	15761	/* 96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x26, 0x26,\
		@@ -29561,17 +29561,12 @@
29561	29561	if( db->nVdbeExec>0 ){
29562	29562	AtomicStore(&db->u1.isInterrupted, 1);
29563	29563	}
29564	29564	DisableLookaside;
29565	29565	if( db->pParse ){
29566		- Parse *pParse;
29567	29566	sqlite3ErrorMsg(db->pParse, "out of memory");
29568	29567	db->pParse->rc = SQLITE_NOMEM_BKPT;
29569		- for(pParse=db->pParse->pOuterParse; pParse; pParse = pParse->pOuterParse){
29570		- pParse->nErr++;
29571		- pParse->rc = SQLITE_NOMEM;
29572		- }
29573	29568	}
29574	29569	}
29575	29570	return 0;
29576	29571	}
29577	29572
		@@ -35280,67 +35275,67 @@
35280	35275	/* 3 */ "Checkpoint" OpHelp(""),
35281	35276	/* 4 */ "JournalMode" OpHelp(""),
35282	35277	/* 5 */ "Vacuum" OpHelp(""),
35283	35278	/* 6 */ "VFilter" OpHelp("iplan=r[P3] zplan='P4'"),
35284	35279	/* 7 */ "VUpdate" OpHelp("data=r[P3@P2]"),
35285		- /* 8 */ "Init" OpHelp("Start at P2"),
35286		- /* 9 */ "Goto" OpHelp(""),
35287		- /* 10 */ "Gosub" OpHelp(""),
35288		- /* 11 */ "InitCoroutine" OpHelp(""),
35289		- /* 12 */ "Yield" OpHelp(""),
35290		- /* 13 */ "MustBeInt" OpHelp(""),
35291		- /* 14 */ "Jump" OpHelp(""),
35292		- /* 15 */ "Once" OpHelp(""),
35293		- /* 16 */ "If" OpHelp(""),
35294		- /* 17 */ "IfNot" OpHelp(""),
35295		- /* 18 */ "IsNullOrType" OpHelp("if typeof(r[P1]) IN (P3,5) goto P2"),
	35280	+ /* 8 */ "Goto" OpHelp(""),
	35281	+ /* 9 */ "Gosub" OpHelp(""),
	35282	+ /* 10 */ "InitCoroutine" OpHelp(""),
	35283	+ /* 11 */ "Yield" OpHelp(""),
	35284	+ /* 12 */ "MustBeInt" OpHelp(""),
	35285	+ /* 13 */ "Jump" OpHelp(""),
	35286	+ /* 14 */ "Once" OpHelp(""),
	35287	+ /* 15 */ "If" OpHelp(""),
	35288	+ /* 16 */ "IfNot" OpHelp(""),
	35289	+ /* 17 */ "IsNullOrType" OpHelp("if typeof(r[P1]) IN (P3,5) goto P2"),
	35290	+ /* 18 */ "IfNullRow" OpHelp("if P1.nullRow then r[P3]=NULL, goto P2"),
35296	35291	/* 19 */ "Not" OpHelp("r[P2]= !r[P1]"),
35297		- /* 20 */ "IfNullRow" OpHelp("if P1.nullRow then r[P3]=NULL, goto P2"),
35298		- /* 21 */ "SeekLT" OpHelp("key=r[P3@P4]"),
35299		- /* 22 */ "SeekLE" OpHelp("key=r[P3@P4]"),
35300		- /* 23 */ "SeekGE" OpHelp("key=r[P3@P4]"),
35301		- /* 24 */ "SeekGT" OpHelp("key=r[P3@P4]"),
35302		- /* 25 */ "IfNotOpen" OpHelp("if( !csr[P1] ) goto P2"),
35303		- /* 26 */ "IfNoHope" OpHelp("key=r[P3@P4]"),
35304		- /* 27 */ "NoConflict" OpHelp("key=r[P3@P4]"),
35305		- /* 28 */ "NotFound" OpHelp("key=r[P3@P4]"),
35306		- /* 29 */ "Found" OpHelp("key=r[P3@P4]"),
35307		- /* 30 */ "SeekRowid" OpHelp("intkey=r[P3]"),
35308		- /* 31 */ "NotExists" OpHelp("intkey=r[P3]"),
35309		- /* 32 */ "Last" OpHelp(""),
35310		- /* 33 */ "IfSmaller" OpHelp(""),
35311		- /* 34 */ "SorterSort" OpHelp(""),
35312		- /* 35 */ "Sort" OpHelp(""),
35313		- /* 36 */ "Rewind" OpHelp(""),
35314		- /* 37 */ "SorterNext" OpHelp(""),
35315		- /* 38 */ "Prev" OpHelp(""),
35316		- /* 39 */ "Next" OpHelp(""),
35317		- /* 40 */ "IdxLE" OpHelp("key=r[P3@P4]"),
35318		- /* 41 */ "IdxGT" OpHelp("key=r[P3@P4]"),
35319		- /* 42 */ "IdxLT" OpHelp("key=r[P3@P4]"),
	35292	+ /* 20 */ "SeekLT" OpHelp("key=r[P3@P4]"),
	35293	+ /* 21 */ "SeekLE" OpHelp("key=r[P3@P4]"),
	35294	+ /* 22 */ "SeekGE" OpHelp("key=r[P3@P4]"),
	35295	+ /* 23 */ "SeekGT" OpHelp("key=r[P3@P4]"),
	35296	+ /* 24 */ "IfNotOpen" OpHelp("if( !csr[P1] ) goto P2"),
	35297	+ /* 25 */ "IfNoHope" OpHelp("key=r[P3@P4]"),
	35298	+ /* 26 */ "NoConflict" OpHelp("key=r[P3@P4]"),
	35299	+ /* 27 */ "NotFound" OpHelp("key=r[P3@P4]"),
	35300	+ /* 28 */ "Found" OpHelp("key=r[P3@P4]"),
	35301	+ /* 29 */ "SeekRowid" OpHelp("intkey=r[P3]"),
	35302	+ /* 30 */ "NotExists" OpHelp("intkey=r[P3]"),
	35303	+ /* 31 */ "Last" OpHelp(""),
	35304	+ /* 32 */ "IfSmaller" OpHelp(""),
	35305	+ /* 33 */ "SorterSort" OpHelp(""),
	35306	+ /* 34 */ "Sort" OpHelp(""),
	35307	+ /* 35 */ "Rewind" OpHelp(""),
	35308	+ /* 36 */ "SorterNext" OpHelp(""),
	35309	+ /* 37 */ "Prev" OpHelp(""),
	35310	+ /* 38 */ "Next" OpHelp(""),
	35311	+ /* 39 */ "IdxLE" OpHelp("key=r[P3@P4]"),
	35312	+ /* 40 */ "IdxGT" OpHelp("key=r[P3@P4]"),
	35313	+ /* 41 */ "IdxLT" OpHelp("key=r[P3@P4]"),
	35314	+ /* 42 */ "IdxGE" OpHelp("key=r[P3@P4]"),
35320	35315	/* 43 */ "Or" OpHelp("r[P3]=(r[P1] \|\| r[P2])"),
35321	35316	/* 44 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"),
35322		- /* 45 */ "IdxGE" OpHelp("key=r[P3@P4]"),
35323		- /* 46 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
35324		- /* 47 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
35325		- /* 48 */ "Program" OpHelp(""),
35326		- /* 49 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
	35317	+ /* 45 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
	35318	+ /* 46 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
	35319	+ /* 47 */ "Program" OpHelp(""),
	35320	+ /* 48 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
	35321	+ /* 49 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
35327	35322	/* 50 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"),
35328	35323	/* 51 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"),
35329	35324	/* 52 */ "Ne" OpHelp("IF r[P3]!=r[P1]"),
35330	35325	/* 53 */ "Eq" OpHelp("IF r[P3]==r[P1]"),
35331	35326	/* 54 */ "Gt" OpHelp("IF r[P3]>r[P1]"),
35332	35327	/* 55 */ "Le" OpHelp("IF r[P3]<=r[P1]"),
35333	35328	/* 56 */ "Lt" OpHelp("IF r[P3]<r[P1]"),
35334	35329	/* 57 */ "Ge" OpHelp("IF r[P3]>=r[P1]"),
35335	35330	/* 58 */ "ElseEq" OpHelp(""),
35336		- /* 59 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
35337		- /* 60 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
35338		- /* 61 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
35339		- /* 62 */ "IncrVacuum" OpHelp(""),
35340		- /* 63 */ "VNext" OpHelp(""),
35341		- /* 64 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
	35331	+ /* 59 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
	35332	+ /* 60 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
	35333	+ /* 61 */ "IncrVacuum" OpHelp(""),
	35334	+ /* 62 */ "VNext" OpHelp(""),
	35335	+ /* 63 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
	35336	+ /* 64 */ "Init" OpHelp("Start at P2"),
35342	35337	/* 65 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
35343	35338	/* 66 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
35344	35339	/* 67 */ "Return" OpHelp(""),
35345	35340	/* 68 */ "EndCoroutine" OpHelp(""),
35346	35341	/* 69 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
		@@ -68314,10 +68309,11 @@
68314	68309	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
68315	68310	assert( pPage->pBt!=0 );
68316	68311	assert( pPage->pBt->usableSize <= SQLITE_MAX_PAGE_SIZE );
68317	68312	assert( pPage->nOverflow==0 );
68318	68313	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
	68314	+ temp = 0;
68319	68315	src = data = pPage->aData;
68320	68316	hdr = pPage->hdrOffset;
68321	68317	cellOffset = pPage->cellOffset;
68322	68318	nCell = pPage->nCell;
68323	68319	assert( nCell==get2byte(&data[hdr+3]) \|\| CORRUPT_DB );
		@@ -68368,42 +68364,43 @@
68368	68364	}
68369	68365
68370	68366	cbrk = usableSize;
68371	68367	iCellLast = usableSize - 4;
68372	68368	iCellStart = get2byte(&data[hdr+5]);
68373		- if( nCell>0 ){
68374		- temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
68375		- memcpy(&temp[iCellStart], &data[iCellStart], usableSize - iCellStart);
68376		- src = temp;
68377		- for(i=0; i<nCell; i++){
68378		- u8 pAddr; / The i-th cell pointer */
68379		- pAddr = &data[cellOffset + i*2];
68380		- pc = get2byte(pAddr);
68381		- testcase( pc==iCellFirst );
68382		- testcase( pc==iCellLast );
68383		- /* These conditions have already been verified in btreeInitPage()
68384		- ** if PRAGMA cell_size_check=ON.
68385		- */
68386		- if( pc<iCellStart \|\| pc>iCellLast ){
68387		- return SQLITE_CORRUPT_PAGE(pPage);
68388		- }
68389		- assert( pc>=iCellStart && pc<=iCellLast );
68390		- size = pPage->xCellSize(pPage, &src[pc]);
68391		- cbrk -= size;
68392		- if( cbrk<iCellStart \|\| pc+size>usableSize ){
68393		- return SQLITE_CORRUPT_PAGE(pPage);
68394		- }
68395		- assert( cbrk+size<=usableSize && cbrk>=iCellStart );
68396		- testcase( cbrk+size==usableSize );
68397		- testcase( pc+size==usableSize );
68398		- put2byte(pAddr, cbrk);
68399		- memcpy(&data[cbrk], &src[pc], size);
68400		- }
	68369	+ for(i=0; i<nCell; i++){
	68370	+ u8 pAddr; / The i-th cell pointer */
	68371	+ pAddr = &data[cellOffset + i*2];
	68372	+ pc = get2byte(pAddr);
	68373	+ testcase( pc==iCellFirst );
	68374	+ testcase( pc==iCellLast );
	68375	+ /* These conditions have already been verified in btreeInitPage()
	68376	+ ** if PRAGMA cell_size_check=ON.
	68377	+ */
	68378	+ if( pc<iCellStart \|\| pc>iCellLast ){
	68379	+ return SQLITE_CORRUPT_PAGE(pPage);
	68380	+ }
	68381	+ assert( pc>=iCellStart && pc<=iCellLast );
	68382	+ size = pPage->xCellSize(pPage, &src[pc]);
	68383	+ cbrk -= size;
	68384	+ if( cbrk<iCellStart \|\| pc+size>usableSize ){
	68385	+ return SQLITE_CORRUPT_PAGE(pPage);
	68386	+ }
	68387	+ assert( cbrk+size<=usableSize && cbrk>=iCellStart );
	68388	+ testcase( cbrk+size==usableSize );
	68389	+ testcase( pc+size==usableSize );
	68390	+ put2byte(pAddr, cbrk);
	68391	+ if( temp==0 ){
	68392	+ if( cbrk==pc ) continue;
	68393	+ temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
	68394	+ memcpy(&temp[iCellStart], &data[iCellStart], usableSize - iCellStart);
	68395	+ src = temp;
	68396	+ }
	68397	+ memcpy(&data[cbrk], &src[pc], size);
68401	68398	}
68402	68399	data[hdr+7] = 0;
68403	68400
68404		-defragment_out:
	68401	+ defragment_out:
68405	68402	assert( pPage->nFree>=0 );
68406	68403	if( data[hdr+7]+cbrk-iCellFirst!=pPage->nFree ){
68407	68404	return SQLITE_CORRUPT_PAGE(pPage);
68408	68405	}
68409	68406	assert( cbrk>=iCellFirst );
		@@ -68472,13 +68469,13 @@
68472	68469	return &aData[pc + x];
68473	68470	}
68474	68471	iAddr = pc;
68475	68472	pTmp = &aData[pc];
68476	68473	pc = get2byte(pTmp);
68477		- if( pc<=iAddr ){
	68474	+ if( pc<=iAddr+size ){
68478	68475	if( pc ){
68479		- /* The next slot in the chain comes before the current slot */
	68476	+ /* The next slot in the chain is not past the end of the current slot */
68480	68477	*pRc = SQLITE_CORRUPT_PAGE(pPg);
68481	68478	}
68482	68479	return 0;
68483	68480	}
68484	68481	}
		@@ -68626,11 +68623,11 @@
68626	68623	iPtr = hdr + 1;
68627	68624	if( data[iPtr+1]==0 && data[iPtr]==0 ){
68628	68625	iFreeBlk = 0; /* Shortcut for the case when the freelist is empty */
68629	68626	}else{
68630	68627	while( (iFreeBlk = get2byte(&data[iPtr]))<iStart ){
68631		- if( iFreeBlk<=iPtr ){
	68628	+ if( iFreeBlk<iPtr+4 ){
68632	68629	if( iFreeBlk==0 ) break; /* TH3: corrupt082.100 */
68633	68630	return SQLITE_CORRUPT_PAGE(pPage);
68634	68631	}
68635	68632	iPtr = iFreeBlk;
68636	68633	}
		@@ -69108,11 +69105,13 @@
69108	69105	if( pCur ){
69109	69106	pCur->iPage--;
69110	69107	pCur->pPage = pCur->apPage[pCur->iPage];
69111	69108	}
69112	69109	testcase( pgno==0 );
69113		- assert( pgno!=0 \|\| rc!=SQLITE_OK );
	69110	+ assert( pgno!=0 \|\| rc==SQLITE_CORRUPT
	69111	+ \|\| rc==SQLITE_IOERR_NOMEM
	69112	+ \|\| rc==SQLITE_NOMEM );
69114	69113	return rc;
69115	69114	}
69116	69115
69117	69116	/*
69118	69117	** Release a MemPage. This should be called once for each prior
		@@ -72050,10 +72049,12 @@
72050	72049	** the new child page does not match the flags field of the parent (i.e.
72051	72050	** if an intkey page appears to be the parent of a non-intkey page, or
72052	72051	** vice-versa).
72053	72052	*/
72054	72053	static int moveToChild(BtCursor *pCur, u32 newPgno){
	72054	+ BtShared *pBt = pCur->pBt;
	72055	+
72055	72056	assert( cursorOwnsBtShared(pCur) );
72056	72057	assert( pCur->eState==CURSOR_VALID );
72057	72058	assert( pCur->iPage<BTCURSOR_MAX_DEPTH );
72058	72059	assert( pCur->iPage>=0 );
72059	72060	if( pCur->iPage>=(BTCURSOR_MAX_DEPTH-1) ){
		@@ -72063,12 +72064,11 @@
72063	72064	pCur->curFlags &= ~(BTCF_ValidNKey\|BTCF_ValidOvfl);
72064	72065	pCur->aiIdx[pCur->iPage] = pCur->ix;
72065	72066	pCur->apPage[pCur->iPage] = pCur->pPage;
72066	72067	pCur->ix = 0;
72067	72068	pCur->iPage++;
72068		- return getAndInitPage(pCur->pBt, newPgno, &pCur->pPage, pCur,
72069		- pCur->curPagerFlags);
	72069	+ return getAndInitPage(pBt, newPgno, &pCur->pPage, pCur, pCur->curPagerFlags);
72070	72070	}
72071	72071
72072	72072	#ifdef SQLITE_DEBUG
72073	72073	/*
72074	72074	** Page pParent is an internal (non-leaf) tree page. This function
		@@ -72170,11 +72170,11 @@
72170	72170	assert( pCur->skipNext!=SQLITE_OK );
72171	72171	return pCur->skipNext;
72172	72172	}
72173	72173	sqlite3BtreeClearCursor(pCur);
72174	72174	}
72175		- rc = getAndInitPage(pCur->pBt, pCur->pgnoRoot, &pCur->pPage,
	72175	+ rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->pPage,
72176	72176	0, pCur->curPagerFlags);
72177	72177	if( rc!=SQLITE_OK ){
72178	72178	pCur->eState = CURSOR_INVALID;
72179	72179	return rc;
72180	72180	}
		@@ -73811,10 +73811,16 @@
73811	73811	data = pPage->aData;
73812	73812	ptr = &pPage->aCellIdx[2*idx];
73813	73813	assert( pPage->pBt->usableSize > (u32)(ptr-data) );
73814	73814	pc = get2byte(ptr);
73815	73815	hdr = pPage->hdrOffset;
	73816	+#if 0 /* Not required. Omit for efficiency */
	73817	+ if( pc<hdr+pPage->nCell*2 ){
	73818	+ *pRC = SQLITE_CORRUPT_BKPT;
	73819	+ return;
	73820	+ }
	73821	+#endif
73816	73822	testcase( pc==(u32)get2byte(&data[hdr+5]) );
73817	73823	testcase( pc+sz==pPage->pBt->usableSize );
73818	73824	if( pc+sz > pPage->pBt->usableSize ){
73819	73825	*pRC = SQLITE_CORRUPT_BKPT;
73820	73826	return;
		@@ -80761,18 +80767,11 @@
80761	80767	return 0;
80762	80768	}
80763	80769	#endif
80764	80770
80765	80771	/*
80766		-** Swap byte-code between two VDBE structures.
80767		-**
80768		-** This happens after pB was previously run and returned
80769		-** SQLITE_SCHEMA. The statement was then reprepared in pA.
80770		-** This routine transfers the new bytecode in pA over to pB
80771		-** so that pB can be run again. The old pB byte code is
80772		-** moved back to pA so that it will be cleaned up when pA is
80773		-** finalized.
	80772	+** Swap all content between two VDBE structures.
80774	80773	*/
80775	80774	SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe pA, Vdbe pB){
80776	80775	Vdbe tmp, *pTmp;
80777	80776	char *zTmp;
80778	80777	assert( pA->db==pB->db );
		@@ -81459,12 +81458,12 @@
81459	81458	Parse *pParse = p->pParse;
81460	81459	int *aLabel = pParse->aLabel;
81461	81460	p->readOnly = 1;
81462	81461	p->bIsReader = 0;
81463	81462	pOp = &p->aOp[p->nOp-1];
81464		- assert( p->aOp[0].opcode==OP_Init );
81465		- while( 1 /* Loop termates when it reaches the OP_Init opcode */ ){
	81463	+ while(1){
	81464	+
81466	81465	/* Only JUMP opcodes and the short list of special opcodes in the switch
81467	81466	** below need to be considered. The mkopcodeh.tcl generator script groups
81468	81467	** all these opcodes together near the front of the opcode list. Skip
81469	81468	** any opcode that does not need processing by virtual of the fact that
81470	81469	** it is larger than SQLITE_MX_JUMP_OPCODE, as a performance optimization.
		@@ -81489,14 +81488,10 @@
81489	81488	case OP_JournalMode: {
81490	81489	p->readOnly = 0;
81491	81490	p->bIsReader = 1;
81492	81491	break;
81493	81492	}
81494		- case OP_Init: {
81495		- assert( pOp->p2>=0 );
81496		- goto resolve_p2_values_loop_exit;
81497		- }
81498	81493	#ifndef SQLITE_OMIT_VIRTUALTABLE
81499	81494	case OP_VUpdate: {
81500	81495	if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
81501	81496	break;
81502	81497	}
		@@ -81525,14 +81520,13 @@
81525	81520	/* The mkopcodeh.tcl script has so arranged things that the only
81526	81521	** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
81527	81522	** have non-negative values for P2. */
81528	81523	assert( (sqlite3OpcodeProperty[pOp->opcode]&OPFLG_JUMP)==0 \|\| pOp->p2>=0);
81529	81524	}
81530		- assert( pOp>p->aOp );
	81525	+ if( pOp==p->aOp ) break;
81531	81526	pOp--;
81532	81527	}
81533		-resolve_p2_values_loop_exit:
81534	81528	if( aLabel ){
81535	81529	sqlite3DbFreeNN(p->db, pParse->aLabel);
81536	81530	pParse->aLabel = 0;
81537	81531	}
81538	81532	pParse->nLabel = 0;
		@@ -86054,13 +86048,11 @@
86054	86048	Vdbe v = (Vdbe)pStmt;
86055	86049	sqlite3 *db = v->db;
86056	86050	if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT;
86057	86051	sqlite3_mutex_enter(db->mutex);
86058	86052	checkProfileCallback(db, v);
86059		- assert( v->eVdbeState>=VDBE_READY_STATE );
86060		- rc = sqlite3VdbeReset(v);
86061		- sqlite3VdbeDelete(v);
	86053	+ rc = sqlite3VdbeFinalize(v);
86062	86054	rc = sqlite3ApiExit(db, rc);
86063	86055	sqlite3LeaveMutexAndCloseZombie(db);
86064	86056	}
86065	86057	return rc;
86066	86058	}
		@@ -90949,18 +90941,15 @@
90949	90941	**
90950	90942	** Check the cursor P1 to see if it is currently pointing at a NULL row.
90951	90943	** If it is, then set register P3 to NULL and jump immediately to P2.
90952	90944	** If P1 is not on a NULL row, then fall through without making any
90953	90945	** changes.
90954		-**
90955		-** If P1 is not an open cursor, then this opcode is a no-op.
90956	90946	*/
90957	90947	case OP_IfNullRow: { /* jump */
90958		- VdbeCursor *pC;
90959	90948	assert( pOp->p1>=0 && pOp->p1<p->nCursor );
90960		- pC = p->apCsr[pOp->p1];
90961		- if( ALWAYS(pC) && pC->nullRow ){
	90949	+ assert( p->apCsr[pOp->p1]!=0 );
	90950	+ if( p->apCsr[pOp->p1]->nullRow ){
90962	90951	sqlite3VdbeMemSetNull(aMem + pOp->p3);
90963	90952	goto jump_to_p2;
90964	90953	}
90965	90954	break;
90966	90955	}
		@@ -101549,37 +101538,27 @@
101549	101538	pDup = sqlite3ExprDup(db, pOrig, 0);
101550	101539	if( db->mallocFailed ){
101551	101540	sqlite3ExprDelete(db, pDup);
101552	101541	pDup = 0;
101553	101542	}else{
	101543	+ Expr temp;
101554	101544	incrAggFunctionDepth(pDup, nSubquery);
101555	101545	if( pExpr->op==TK_COLLATE ){
101556	101546	assert( !ExprHasProperty(pExpr, EP_IntValue) );
101557	101547	pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken);
101558	101548	}
101559		-
101560		- /* Before calling sqlite3ExprDelete(), set the EP_Static flag. This
101561		- ** prevents ExprDelete() from deleting the Expr structure itself,
101562		- ** allowing it to be repopulated by the memcpy() on the following line.
101563		- ** The pExpr->u.zToken might point into memory that will be freed by the
101564		- ** sqlite3DbFree(db, pDup) on the last line of this block, so be sure to
101565		- ** make a copy of the token before doing the sqlite3DbFree().
101566		- */
101567		- ExprSetProperty(pExpr, EP_Static);
101568		- sqlite3ExprDelete(db, pExpr);
101569		- memcpy(pExpr, pDup, sizeof(*pExpr));
101570		- if( !ExprHasProperty(pExpr, EP_IntValue) && pExpr->u.zToken!=0 ){
101571		- assert( (pExpr->flags & (EP_Reduced\|EP_TokenOnly))==0 );
101572		- pExpr->u.zToken = sqlite3DbStrDup(db, pExpr->u.zToken);
101573		- pExpr->flags \|= EP_MemToken;
101574		- }
	101549	+ memcpy(&temp, pDup, sizeof(Expr));
	101550	+ memcpy(pDup, pExpr, sizeof(Expr));
	101551	+ memcpy(pExpr, &temp, sizeof(Expr));
101575	101552	if( ExprHasProperty(pExpr, EP_WinFunc) ){
101576	101553	if( ALWAYS(pExpr->y.pWin!=0) ){
101577	101554	pExpr->y.pWin->pOwner = pExpr;
101578	101555	}
101579	101556	}
101580		- sqlite3DbFree(db, pDup);
	101557	+ sqlite3ParserAddCleanup(pParse,
	101558	+ (void()(sqlite3,void*))sqlite3ExprDelete,
	101559	+ pDup);
101581	101560	}
101582	101561	}
101583	101562
101584	101563	/*
101585	101564	** Subqueries stores the original database, table and column names for their
		@@ -137363,10 +137342,13 @@
137363	137342	}
137364	137343
137365	137344	/*
137366	137345	** Return a pointer to a string containing the 'declaration type' of the
137367	137346	** expression pExpr. The string may be treated as static by the caller.
	137347	+**
	137348	+** Also try to estimate the size of the returned value and return that
	137349	+** result in *pEstWidth.
137368	137350	**
137369	137351	** The declaration type is the exact datatype definition extracted from the
137370	137352	** original CREATE TABLE statement if the expression is a column. The
137371	137353	** declaration type for a ROWID field is INTEGER. Exactly when an expression
137372	137354	** is considered a column can be complex in the presence of subqueries. The
		@@ -139609,12 +139591,11 @@
139609	139591	**
139610	139592	** (3) If the subquery is the right operand of a LEFT JOIN then
139611	139593	** (3a) the subquery may not be a join and
139612	139594	** (3b) the FROM clause of the subquery may not contain a virtual
139613	139595	** table and
139614		-** (3c) The outer query may not have a GROUP BY. (This limitation is
139615		-** due to how TK_IF_NULL_ROW works. FIX ME!)
	139596	+** (3c) the outer query may not be an aggregate.
139616	139597	** (3d) the outer query may not be DISTINCT.
139617	139598	** See also (26) for restrictions on RIGHT JOIN.
139618	139599	**
139619	139600	** (4) The subquery can not be DISTINCT.
139620	139601	**
		@@ -139822,17 +139803,22 @@
139822	139803	**
139823	139804	** (t1 LEFT OUTER JOIN t2) JOIN t3
139824	139805	**
139825	139806	** which is not at all the same thing.
139826	139807	**
	139808	+ ** If the subquery is the right operand of a LEFT JOIN, then the outer
	139809	+ ** query cannot be an aggregate. (3c) This is an artifact of the way
	139810	+ ** aggregates are processed - there is no mechanism to determine if
	139811	+ ** the LEFT JOIN table should be all-NULL.
	139812	+ **
139827	139813	** See also tickets #306, #350, and #3300.
139828	139814	*/
139829	139815	if( (pSubitem->fg.jointype & (JT_OUTER\|JT_LTORJ))!=0 ){
139830	139816	if( pSubSrc->nSrc>1 /* (3a) */
	139817	+ \|\| isAgg /* (3c) */
139831	139818	\|\| IsVirtual(pSubSrc->a[0].pTab) /* (3b) */
139832	139819	\|\| (p->selFlags & SF_Distinct)!=0 /* (3d) */
139833		- \|\| (p->pGroupBy!=0) /* (3c) */
139834	139820	\|\| (pSubitem->fg.jointype & JT_RIGHT)!=0 /* (26) */
139835	139821	){
139836	139822	return 0;
139837	139823	}
139838	139824	isOuterJoin = 1;
		@@ -140747,11 +140733,10 @@
140747	140733	if( p->pWhere
140748	140734	\|\| p->pEList->nExpr!=1
140749	140735	\|\| p->pSrc->nSrc!=1
140750	140736	\|\| p->pSrc->a[0].pSelect
140751	140737	\|\| pAggInfo->nFunc!=1
140752		- \|\| p->pHaving
140753	140738	){
140754	140739	return 0;
140755	140740	}
140756	140741	pTab = p->pSrc->a[0].pTab;
140757	140742	assert( pTab!=0 );
		@@ -156143,22 +156128,16 @@
156143	156128	}
156144	156129	}
156145	156130	}
156146	156131
156147	156132	/*
156148		-** Deallocate internal memory used by a WhereLoop object. Leave the
156149		-** object in an initialized state, as if it had been newly allocated.
	156133	+** Deallocate internal memory used by a WhereLoop object
156150	156134	*/
156151	156135	static void whereLoopClear(sqlite3 db, WhereLoop p){
156152		- if( p->aLTerm!=p->aLTermSpace ){
156153		- sqlite3DbFreeNN(db, p->aLTerm);
156154		- p->aLTerm = p->aLTermSpace;
156155		- p->nLSlot = ArraySize(p->aLTermSpace);
156156		- }
	156136	+ if( p->aLTerm!=p->aLTermSpace ) sqlite3DbFreeNN(db, p->aLTerm);
156157	156137	whereLoopClearUnion(db, p);
156158		- p->nLTerm = 0;
156159		- p->wsFlags = 0;
	156138	+ whereLoopInit(p);
156160	156139	}
156161	156140
156162	156141	/*
156163	156142	** Increase the memory allocation for pLoop->aLTerm[] to be at least n.
156164	156143	*/
		@@ -156178,13 +156157,11 @@
156178	156157	/*
156179	156158	** Transfer content from the second pLoop into the first.
156180	156159	*/
156181	156160	static int whereLoopXfer(sqlite3 db, WhereLoop pTo, WhereLoop *pFrom){
156182	156161	whereLoopClearUnion(db, pTo);
156183		- if( pFrom->nLTerm > pTo->nLSlot
156184		- && whereLoopResize(db, pTo, pFrom->nLTerm)
156185		- ){
	156162	+ if( whereLoopResize(db, pTo, pFrom->nLTerm) ){
156186	156163	memset(pTo, 0, WHERE_LOOP_XFER_SZ);
156187	156164	return SQLITE_NOMEM_BKPT;
156188	156165	}
156189	156166	memcpy(pTo, pFrom, WHERE_LOOP_XFER_SZ);
156190	156167	memcpy(pTo->aLTerm, pFrom->aLTerm, pTo->nLTerm*sizeof(pTo->aLTerm[0]));
		@@ -156833,15 +156810,11 @@
156833	156810	pNew->wsFlags = saved_wsFlags;
156834	156811	pNew->u.btree.nEq = saved_nEq;
156835	156812	pNew->u.btree.nBtm = saved_nBtm;
156836	156813	pNew->u.btree.nTop = saved_nTop;
156837	156814	pNew->nLTerm = saved_nLTerm;
156838		- if( pNew->nLTerm>=pNew->nLSlot
156839		- && whereLoopResize(db, pNew, pNew->nLTerm+1)
156840		- ){
156841		- break; /* OOM while trying to enlarge the pNew->aLTerm array */
156842		- }
	156815	+ if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
156843	156816	pNew->aLTerm[pNew->nLTerm++] = pTerm;
156844	156817	pNew->prereq = (saved_prereq \| pTerm->prereqRight) & ~pNew->maskSelf;
156845	156818
156846	156819	assert( nInMul==0
156847	156820	\|\| (pNew->wsFlags & WHERE_COLUMN_NULL)!=0
		@@ -156930,43 +156903,42 @@
156930	156903	}
156931	156904	}
156932	156905	if( scan.iEquiv>1 ) pNew->wsFlags \|= WHERE_TRANSCONS;
156933	156906	}else if( eOp & WO_ISNULL ){
156934	156907	pNew->wsFlags \|= WHERE_COLUMN_NULL;
	156908	+ }else if( eOp & (WO_GT\|WO_GE) ){
	156909	+ testcase( eOp & WO_GT );
	156910	+ testcase( eOp & WO_GE );
	156911	+ pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
	156912	+ pNew->u.btree.nBtm = whereRangeVectorLen(
	156913	+ pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
	156914	+ );
	156915	+ pBtm = pTerm;
	156916	+ pTop = 0;
	156917	+ if( pTerm->wtFlags & TERM_LIKEOPT ){
	156918	+ /* Range constraints that come from the LIKE optimization are
	156919	+ ** always used in pairs. */
	156920	+ pTop = &pTerm[1];
	156921	+ assert( (pTop-(pTerm->pWC->a))<pTerm->pWC->nTerm );
	156922	+ assert( pTop->wtFlags & TERM_LIKEOPT );
	156923	+ assert( pTop->eOperator==WO_LT );
	156924	+ if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
	156925	+ pNew->aLTerm[pNew->nLTerm++] = pTop;
	156926	+ pNew->wsFlags \|= WHERE_TOP_LIMIT;
	156927	+ pNew->u.btree.nTop = 1;
	156928	+ }
156935	156929	}else{
156936		- int nVecLen = whereRangeVectorLen(
	156930	+ assert( eOp & (WO_LT\|WO_LE) );
	156931	+ testcase( eOp & WO_LT );
	156932	+ testcase( eOp & WO_LE );
	156933	+ pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
	156934	+ pNew->u.btree.nTop = whereRangeVectorLen(
156937	156935	pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
156938	156936	);
156939		- if( eOp & (WO_GT\|WO_GE) ){
156940		- testcase( eOp & WO_GT );
156941		- testcase( eOp & WO_GE );
156942		- pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
156943		- pNew->u.btree.nBtm = nVecLen;
156944		- pBtm = pTerm;
156945		- pTop = 0;
156946		- if( pTerm->wtFlags & TERM_LIKEOPT ){
156947		- /* Range constraints that come from the LIKE optimization are
156948		- ** always used in pairs. */
156949		- pTop = &pTerm[1];
156950		- assert( (pTop-(pTerm->pWC->a))<pTerm->pWC->nTerm );
156951		- assert( pTop->wtFlags & TERM_LIKEOPT );
156952		- assert( pTop->eOperator==WO_LT );
156953		- if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
156954		- pNew->aLTerm[pNew->nLTerm++] = pTop;
156955		- pNew->wsFlags \|= WHERE_TOP_LIMIT;
156956		- pNew->u.btree.nTop = 1;
156957		- }
156958		- }else{
156959		- assert( eOp & (WO_LT\|WO_LE) );
156960		- testcase( eOp & WO_LT );
156961		- testcase( eOp & WO_LE );
156962		- pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
156963		- pNew->u.btree.nTop = nVecLen;
156964		- pTop = pTerm;
156965		- pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
156966		- pNew->aLTerm[pNew->nLTerm-2] : 0;
156967		- }
	156937	+ pTop = pTerm;
	156938	+ pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
	156939	+ pNew->aLTerm[pNew->nLTerm-2] : 0;
156968	156940	}
156969	156941
156970	156942	/* At this point pNew->nOut is set to the number of rows expected to
156971	156943	** be visited by the index scan before considering term pTerm, or the
156972	156944	** values of nIn and nInMul. In other words, assuming that all
		@@ -158134,17 +158106,11 @@
158134	158106	WhereLoop *pNew;
158135	158107
158136	158108
158137	158109	/* Loop over the tables in the join, from left to right */
158138	158110	pNew = pBuilder->pNew;
158139		-
158140		- /* Verify that pNew has already been initialized */
158141		- assert( pNew->nLTerm==0 );
158142		- assert( pNew->wsFlags==0 );
158143		- assert( pNew->nLSlot>=ArraySize(pNew->aLTermSpace) );
158144		- assert( pNew->aLTerm!=0 );
158145		-
	158111	+ whereLoopInit(pNew);
158146	158112	pBuilder->iPlanLimit = SQLITE_QUERY_PLANNER_LIMIT;
158147	158113	for(iTab=0, pItem=pTabList->a; pItem<pEnd; iTab++, pItem++){
158148	158114	Bitmask mUnusable = 0;
158149	158115	pNew->iTab = iTab;
158150	158116	pBuilder->iPlanLimit += SQLITE_QUERY_PLANNER_LIMIT_INCR;
		@@ -158737,13 +158703,13 @@
158737	158703	for(ii=0, pFrom=aFrom; ii<nFrom; ii++, pFrom++){
158738	158704	for(pWLoop=pWInfo->pLoops; pWLoop; pWLoop=pWLoop->pNextLoop){
158739	158705	LogEst nOut; /* Rows visited by (pFrom+pWLoop) */
158740	158706	LogEst rCost; /* Cost of path (pFrom+pWLoop) */
158741	158707	LogEst rUnsorted; /* Unsorted cost of (pFrom+pWLoop) */
158742		- i8 isOrdered; /* isOrdered for (pFrom+pWLoop) */
	158708	+ i8 isOrdered = pFrom->isOrdered; /* isOrdered for (pFrom+pWLoop) */
158743	158709	Bitmask maskNew; /* Mask of src visited by (..) */
158744		- Bitmask revMask; /* Mask of rev-order loops for (..) */
	158710	+ Bitmask revMask = 0; /* Mask of rev-order loops for (..) */
158745	158711
158746	158712	if( (pWLoop->prereq & ~pFrom->maskLoop)!=0 ) continue;
158747	158713	if( (pWLoop->maskSelf & pFrom->maskLoop)!=0 ) continue;
158748	158714	if( (pWLoop->wsFlags & WHERE_AUTO_INDEX)!=0 && pFrom->nRow<3 ){
158749	158715	/* Do not use an automatic index if the this loop is expected
		@@ -158758,13 +158724,11 @@
158758	158724	** Compute its cost */
158759	158725	rUnsorted = sqlite3LogEstAdd(pWLoop->rSetup,pWLoop->rRun + pFrom->nRow);
158760	158726	rUnsorted = sqlite3LogEstAdd(rUnsorted, pFrom->rUnsorted);
158761	158727	nOut = pFrom->nRow + pWLoop->nOut;
158762	158728	maskNew = pFrom->maskLoop \| pWLoop->maskSelf;
158763		- isOrdered = pFrom->isOrdered;
158764	158729	if( isOrdered<0 ){
158765		- revMask = 0;
158766	158730	isOrdered = wherePathSatisfiesOrderBy(pWInfo,
158767	158731	pWInfo->pOrderBy, pFrom, pWInfo->wctrlFlags,
158768	158732	iLoop, pWLoop, &revMask);
158769	158733	}else{
158770	158734	revMask = pFrom->revLoop;
		@@ -212539,16 +212503,15 @@
212539	212503	*/
212540	212504	static int dbpageBegin(sqlite3_vtab *pVtab){
212541	212505	DbpageTable pTab = (DbpageTable )pVtab;
212542	212506	sqlite3 *db = pTab->db;
212543	212507	int i;
212544		- int rc = SQLITE_OK;
212545		- for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
	212508	+ for(i=0; i<db->nDb; i++){
212546	212509	Btree *pBt = db->aDb[i].pBt;
212547		- if( pBt ) rc = sqlite3BtreeBeginTrans(pBt, 1, 0);
	212510	+ if( pBt ) sqlite3BtreeBeginTrans(pBt, 1, 0);
212548	212511	}
212549		- return rc;
	212512	+ return SQLITE_OK;
212550	212513	}
212551	212514
212552	212515
212553	212516	/*
212554	212517	** Invoke this routine to register the "dbpage" virtual table module
		@@ -236671,11 +236634,11 @@
236671	236634	int nArg, /* Number of args */
236672	236635	sqlite3_value *apUnused / Function arguments */
236673	236636	){
236674	236637	assert( nArg==0 );
236675	236638	UNUSED_PARAM2(nArg, apUnused);
236676		- sqlite3_result_text(pCtx, "fts5: 2022-07-18 19:32:30 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a", -1, SQLITE_TRANSIENT);
	236639	+ sqlite3_result_text(pCtx, "fts5: 2022-07-21 12:26:01 9141e873c575b049ce7aeaf313d05966f1966087caf33a6c80d2416a28571a21", -1, SQLITE_TRANSIENT);
236677	236640	}
236678	236641
236679	236642	/*
236680	236643	** Return true if zName is the extension on one of the shadow tables used
236681	236644	** by this module.
236682	236645

	--- 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.40.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.
	@@ -450,13 +450,13 @@
450	**
451	** See also: [sqlite3_libversion()],
452	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453	** [sqlite_version()] and [sqlite_source_id()].
454	*/
455	#define SQLITE_VERSION "3.40.0"
456	#define SQLITE_VERSION_NUMBER 3040000
457	#define SQLITE_SOURCE_ID "2022-07-18 19:32:30 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a"
458
459	/*
460	** CAPI3REF: Run-Time Library Version Numbers
461	** KEYWORDS: sqlite3_version sqlite3_sourceid
462	**
	@@ -15553,67 +15553,67 @@
15553	#define OP_Checkpoint 3
15554	#define OP_JournalMode 4
15555	#define OP_Vacuum 5
15556	#define OP_VFilter 6 /* jump, synopsis: iplan=r[P3] zplan='P4' */
15557	#define OP_VUpdate 7 /* synopsis: data=r[P3@P2] */
15558	#define OP_Init 8 /* jump, synopsis: Start at P2 */
15559	#define OP_Goto 9 /* jump */
15560	#define OP_Gosub 10 /* jump */
15561	#define OP_InitCoroutine 11 /* jump */
15562	#define OP_Yield 12 /* jump */
15563	#define OP_MustBeInt 13 /* jump */
15564	#define OP_Jump 14 /* jump */
15565	#define OP_Once 15 /* jump */
15566	#define OP_If 16 /* jump */
15567	#define OP_IfNot 17 /* jump */
15568	#define OP_IsNullOrType 18 /* jump, synopsis: if typeof(r[P1]) IN (P3,5) goto P2 */
15569	#define OP_Not 19 /* same as TK_NOT, synopsis: r[P2]= !r[P1] */
15570	#define OP_IfNullRow 20 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
15571	#define OP_SeekLT 21 /* jump, synopsis: key=r[P3@P4] */
15572	#define OP_SeekLE 22 /* jump, synopsis: key=r[P3@P4] */
15573	#define OP_SeekGE 23 /* jump, synopsis: key=r[P3@P4] */
15574	#define OP_SeekGT 24 /* jump, synopsis: key=r[P3@P4] */
15575	#define OP_IfNotOpen 25 /* jump, synopsis: if( !csr[P1] ) goto P2 */
15576	#define OP_IfNoHope 26 /* jump, synopsis: key=r[P3@P4] */
15577	#define OP_NoConflict 27 /* jump, synopsis: key=r[P3@P4] */
15578	#define OP_NotFound 28 /* jump, synopsis: key=r[P3@P4] */
15579	#define OP_Found 29 /* jump, synopsis: key=r[P3@P4] */
15580	#define OP_SeekRowid 30 /* jump, synopsis: intkey=r[P3] */
15581	#define OP_NotExists 31 /* jump, synopsis: intkey=r[P3] */
15582	#define OP_Last 32 /* jump */
15583	#define OP_IfSmaller 33 /* jump */
15584	#define OP_SorterSort 34 /* jump */
15585	#define OP_Sort 35 /* jump */
15586	#define OP_Rewind 36 /* jump */
15587	#define OP_SorterNext 37 /* jump */
15588	#define OP_Prev 38 /* jump */
15589	#define OP_Next 39 /* jump */
15590	#define OP_IdxLE 40 /* jump, synopsis: key=r[P3@P4] */
15591	#define OP_IdxGT 41 /* jump, synopsis: key=r[P3@P4] */
15592	#define OP_IdxLT 42 /* jump, synopsis: key=r[P3@P4] */
15593	#define OP_Or 43 /* same as TK_OR, synopsis: r[P3]=(r[P1] \|\| r[P2]) */
15594	#define OP_And 44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
15595	#define OP_IdxGE 45 /* jump, synopsis: key=r[P3@P4] */
15596	#define OP_RowSetRead 46 /* jump, synopsis: r[P3]=rowset(P1) */
15597	#define OP_RowSetTest 47 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
15598	#define OP_Program 48 /* jump */
15599	#define OP_FkIfZero 49 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
15600	#define OP_IsNull 50 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
15601	#define OP_NotNull 51 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
15602	#define OP_Ne 52 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
15603	#define OP_Eq 53 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
15604	#define OP_Gt 54 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
15605	#define OP_Le 55 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
15606	#define OP_Lt 56 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
15607	#define OP_Ge 57 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
15608	#define OP_ElseEq 58 /* jump, same as TK_ESCAPE */
15609	#define OP_IfPos 59 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
15610	#define OP_IfNotZero 60 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
15611	#define OP_DecrJumpZero 61 /* jump, synopsis: if (--r[P1])==0 goto P2 */
15612	#define OP_IncrVacuum 62 /* jump */
15613	#define OP_VNext 63 /* jump */
15614	#define OP_Filter 64 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
15615	#define OP_PureFunc 65 /* synopsis: r[P3]=func(r[P2@NP]) */
15616	#define OP_Function 66 /* synopsis: r[P3]=func(r[P2@NP]) */
15617	#define OP_Return 67
15618	#define OP_EndCoroutine 68
15619	#define OP_HaltIfNull 69 /* synopsis: if r[P3]=null halt */
	@@ -15745,17 +15745,17 @@
15745	#define OPFLG_IN3 0x08 /* in3: P3 is an input */
15746	#define OPFLG_OUT2 0x10 /* out2: P2 is an output */
15747	#define OPFLG_OUT3 0x20 /* out3: P3 is an output */
15748	#define OPFLG_INITIALIZER {\
15749	/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,\
15750	/* 8 */ 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01,\
15751	/* 16 */ 0x03, 0x03, 0x03, 0x12, 0x01, 0x09, 0x09, 0x09,\
15752	/* 24 */ 0x09, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,\
15753	/* 32 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\
15754	/* 40 */ 0x01, 0x01, 0x01, 0x26, 0x26, 0x01, 0x23, 0x0b,\
15755	/* 48 */ 0x01, 0x01, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
15756	/* 56 */ 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x03, 0x01, 0x01,\
15757	/* 64 */ 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00, 0x10,\
15758	/* 72 */ 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,\
15759	/* 80 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02, 0x02,\
15760	/* 88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x00, 0x00,\
15761	/* 96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x26, 0x26,\
	@@ -29561,17 +29561,12 @@
29561	if( db->nVdbeExec>0 ){
29562	AtomicStore(&db->u1.isInterrupted, 1);
29563	}
29564	DisableLookaside;
29565	if( db->pParse ){
29566	Parse *pParse;
29567	sqlite3ErrorMsg(db->pParse, "out of memory");
29568	db->pParse->rc = SQLITE_NOMEM_BKPT;
29569	for(pParse=db->pParse->pOuterParse; pParse; pParse = pParse->pOuterParse){
29570	pParse->nErr++;
29571	pParse->rc = SQLITE_NOMEM;
29572	}
29573	}
29574	}
29575	return 0;
29576	}
29577
	@@ -35280,67 +35275,67 @@
35280	/* 3 */ "Checkpoint" OpHelp(""),
35281	/* 4 */ "JournalMode" OpHelp(""),
35282	/* 5 */ "Vacuum" OpHelp(""),
35283	/* 6 */ "VFilter" OpHelp("iplan=r[P3] zplan='P4'"),
35284	/* 7 */ "VUpdate" OpHelp("data=r[P3@P2]"),
35285	/* 8 */ "Init" OpHelp("Start at P2"),
35286	/* 9 */ "Goto" OpHelp(""),
35287	/* 10 */ "Gosub" OpHelp(""),
35288	/* 11 */ "InitCoroutine" OpHelp(""),
35289	/* 12 */ "Yield" OpHelp(""),
35290	/* 13 */ "MustBeInt" OpHelp(""),
35291	/* 14 */ "Jump" OpHelp(""),
35292	/* 15 */ "Once" OpHelp(""),
35293	/* 16 */ "If" OpHelp(""),
35294	/* 17 */ "IfNot" OpHelp(""),
35295	/* 18 */ "IsNullOrType" OpHelp("if typeof(r[P1]) IN (P3,5) goto P2"),
35296	/* 19 */ "Not" OpHelp("r[P2]= !r[P1]"),
35297	/* 20 */ "IfNullRow" OpHelp("if P1.nullRow then r[P3]=NULL, goto P2"),
35298	/* 21 */ "SeekLT" OpHelp("key=r[P3@P4]"),
35299	/* 22 */ "SeekLE" OpHelp("key=r[P3@P4]"),
35300	/* 23 */ "SeekGE" OpHelp("key=r[P3@P4]"),
35301	/* 24 */ "SeekGT" OpHelp("key=r[P3@P4]"),
35302	/* 25 */ "IfNotOpen" OpHelp("if( !csr[P1] ) goto P2"),
35303	/* 26 */ "IfNoHope" OpHelp("key=r[P3@P4]"),
35304	/* 27 */ "NoConflict" OpHelp("key=r[P3@P4]"),
35305	/* 28 */ "NotFound" OpHelp("key=r[P3@P4]"),
35306	/* 29 */ "Found" OpHelp("key=r[P3@P4]"),
35307	/* 30 */ "SeekRowid" OpHelp("intkey=r[P3]"),
35308	/* 31 */ "NotExists" OpHelp("intkey=r[P3]"),
35309	/* 32 */ "Last" OpHelp(""),
35310	/* 33 */ "IfSmaller" OpHelp(""),
35311	/* 34 */ "SorterSort" OpHelp(""),
35312	/* 35 */ "Sort" OpHelp(""),
35313	/* 36 */ "Rewind" OpHelp(""),
35314	/* 37 */ "SorterNext" OpHelp(""),
35315	/* 38 */ "Prev" OpHelp(""),
35316	/* 39 */ "Next" OpHelp(""),
35317	/* 40 */ "IdxLE" OpHelp("key=r[P3@P4]"),
35318	/* 41 */ "IdxGT" OpHelp("key=r[P3@P4]"),
35319	/* 42 */ "IdxLT" OpHelp("key=r[P3@P4]"),
35320	/* 43 */ "Or" OpHelp("r[P3]=(r[P1] \|\| r[P2])"),
35321	/* 44 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"),
35322	/* 45 */ "IdxGE" OpHelp("key=r[P3@P4]"),
35323	/* 46 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
35324	/* 47 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
35325	/* 48 */ "Program" OpHelp(""),
35326	/* 49 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
35327	/* 50 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"),
35328	/* 51 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"),
35329	/* 52 */ "Ne" OpHelp("IF r[P3]!=r[P1]"),
35330	/* 53 */ "Eq" OpHelp("IF r[P3]==r[P1]"),
35331	/* 54 */ "Gt" OpHelp("IF r[P3]>r[P1]"),
35332	/* 55 */ "Le" OpHelp("IF r[P3]<=r[P1]"),
35333	/* 56 */ "Lt" OpHelp("IF r[P3]<r[P1]"),
35334	/* 57 */ "Ge" OpHelp("IF r[P3]>=r[P1]"),
35335	/* 58 */ "ElseEq" OpHelp(""),
35336	/* 59 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
35337	/* 60 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
35338	/* 61 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
35339	/* 62 */ "IncrVacuum" OpHelp(""),
35340	/* 63 */ "VNext" OpHelp(""),
35341	/* 64 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
35342	/* 65 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
35343	/* 66 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
35344	/* 67 */ "Return" OpHelp(""),
35345	/* 68 */ "EndCoroutine" OpHelp(""),
35346	/* 69 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
	@@ -68314,10 +68309,11 @@
68314	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
68315	assert( pPage->pBt!=0 );
68316	assert( pPage->pBt->usableSize <= SQLITE_MAX_PAGE_SIZE );
68317	assert( pPage->nOverflow==0 );
68318	assert( sqlite3_mutex_held(pPage->pBt->mutex) );

68319	src = data = pPage->aData;
68320	hdr = pPage->hdrOffset;
68321	cellOffset = pPage->cellOffset;
68322	nCell = pPage->nCell;
68323	assert( nCell==get2byte(&data[hdr+3]) \|\| CORRUPT_DB );
	@@ -68368,42 +68364,43 @@
68368	}
68369
68370	cbrk = usableSize;
68371	iCellLast = usableSize - 4;
68372	iCellStart = get2byte(&data[hdr+5]);
68373	if( nCell>0 ){
68374	temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
68375	memcpy(&temp[iCellStart], &data[iCellStart], usableSize - iCellStart);
68376	src = temp;
68377	for(i=0; i<nCell; i++){
68378	u8 pAddr; / The i-th cell pointer */
68379	pAddr = &data[cellOffset + i*2];
68380	pc = get2byte(pAddr);
68381	testcase( pc==iCellFirst );
68382	testcase( pc==iCellLast );
68383	/* These conditions have already been verified in btreeInitPage()
68384	** if PRAGMA cell_size_check=ON.
68385	*/
68386	if( pc<iCellStart \|\| pc>iCellLast ){
68387	return SQLITE_CORRUPT_PAGE(pPage);
68388	}
68389	assert( pc>=iCellStart && pc<=iCellLast );
68390	size = pPage->xCellSize(pPage, &src[pc]);
68391	cbrk -= size;
68392	if( cbrk<iCellStart \|\| pc+size>usableSize ){
68393	return SQLITE_CORRUPT_PAGE(pPage);
68394	}
68395	assert( cbrk+size<=usableSize && cbrk>=iCellStart );
68396	testcase( cbrk+size==usableSize );
68397	testcase( pc+size==usableSize );
68398	put2byte(pAddr, cbrk);
68399	memcpy(&data[cbrk], &src[pc], size);
68400	}

68401	}
68402	data[hdr+7] = 0;
68403
68404	defragment_out:
68405	assert( pPage->nFree>=0 );
68406	if( data[hdr+7]+cbrk-iCellFirst!=pPage->nFree ){
68407	return SQLITE_CORRUPT_PAGE(pPage);
68408	}
68409	assert( cbrk>=iCellFirst );
	@@ -68472,13 +68469,13 @@
68472	return &aData[pc + x];
68473	}
68474	iAddr = pc;
68475	pTmp = &aData[pc];
68476	pc = get2byte(pTmp);
68477	if( pc<=iAddr ){
68478	if( pc ){
68479	/* The next slot in the chain comes before the current slot */
68480	*pRc = SQLITE_CORRUPT_PAGE(pPg);
68481	}
68482	return 0;
68483	}
68484	}
	@@ -68626,11 +68623,11 @@
68626	iPtr = hdr + 1;
68627	if( data[iPtr+1]==0 && data[iPtr]==0 ){
68628	iFreeBlk = 0; /* Shortcut for the case when the freelist is empty */
68629	}else{
68630	while( (iFreeBlk = get2byte(&data[iPtr]))<iStart ){
68631	if( iFreeBlk<=iPtr ){
68632	if( iFreeBlk==0 ) break; /* TH3: corrupt082.100 */
68633	return SQLITE_CORRUPT_PAGE(pPage);
68634	}
68635	iPtr = iFreeBlk;
68636	}
	@@ -69108,11 +69105,13 @@
69108	if( pCur ){
69109	pCur->iPage--;
69110	pCur->pPage = pCur->apPage[pCur->iPage];
69111	}
69112	testcase( pgno==0 );
69113	assert( pgno!=0 \|\| rc!=SQLITE_OK );


69114	return rc;
69115	}
69116
69117	/*
69118	** Release a MemPage. This should be called once for each prior
	@@ -72050,10 +72049,12 @@
72050	** the new child page does not match the flags field of the parent (i.e.
72051	** if an intkey page appears to be the parent of a non-intkey page, or
72052	** vice-versa).
72053	*/
72054	static int moveToChild(BtCursor *pCur, u32 newPgno){


72055	assert( cursorOwnsBtShared(pCur) );
72056	assert( pCur->eState==CURSOR_VALID );
72057	assert( pCur->iPage<BTCURSOR_MAX_DEPTH );
72058	assert( pCur->iPage>=0 );
72059	if( pCur->iPage>=(BTCURSOR_MAX_DEPTH-1) ){
	@@ -72063,12 +72064,11 @@
72063	pCur->curFlags &= ~(BTCF_ValidNKey\|BTCF_ValidOvfl);
72064	pCur->aiIdx[pCur->iPage] = pCur->ix;
72065	pCur->apPage[pCur->iPage] = pCur->pPage;
72066	pCur->ix = 0;
72067	pCur->iPage++;
72068	return getAndInitPage(pCur->pBt, newPgno, &pCur->pPage, pCur,
72069	pCur->curPagerFlags);
72070	}
72071
72072	#ifdef SQLITE_DEBUG
72073	/*
72074	** Page pParent is an internal (non-leaf) tree page. This function
	@@ -72170,11 +72170,11 @@
72170	assert( pCur->skipNext!=SQLITE_OK );
72171	return pCur->skipNext;
72172	}
72173	sqlite3BtreeClearCursor(pCur);
72174	}
72175	rc = getAndInitPage(pCur->pBt, pCur->pgnoRoot, &pCur->pPage,
72176	0, pCur->curPagerFlags);
72177	if( rc!=SQLITE_OK ){
72178	pCur->eState = CURSOR_INVALID;
72179	return rc;
72180	}
	@@ -73811,10 +73811,16 @@
73811	data = pPage->aData;
73812	ptr = &pPage->aCellIdx[2*idx];
73813	assert( pPage->pBt->usableSize > (u32)(ptr-data) );
73814	pc = get2byte(ptr);
73815	hdr = pPage->hdrOffset;






73816	testcase( pc==(u32)get2byte(&data[hdr+5]) );
73817	testcase( pc+sz==pPage->pBt->usableSize );
73818	if( pc+sz > pPage->pBt->usableSize ){
73819	*pRC = SQLITE_CORRUPT_BKPT;
73820	return;
	@@ -80761,18 +80767,11 @@
80761	return 0;
80762	}
80763	#endif
80764
80765	/*
80766	** Swap byte-code between two VDBE structures.
80767	**
80768	** This happens after pB was previously run and returned
80769	** SQLITE_SCHEMA. The statement was then reprepared in pA.
80770	** This routine transfers the new bytecode in pA over to pB
80771	** so that pB can be run again. The old pB byte code is
80772	** moved back to pA so that it will be cleaned up when pA is
80773	** finalized.
80774	*/
80775	SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe pA, Vdbe pB){
80776	Vdbe tmp, *pTmp;
80777	char *zTmp;
80778	assert( pA->db==pB->db );
	@@ -81459,12 +81458,12 @@
81459	Parse *pParse = p->pParse;
81460	int *aLabel = pParse->aLabel;
81461	p->readOnly = 1;
81462	p->bIsReader = 0;
81463	pOp = &p->aOp[p->nOp-1];
81464	assert( p->aOp[0].opcode==OP_Init );
81465	while( 1 /* Loop termates when it reaches the OP_Init opcode */ ){
81466	/* Only JUMP opcodes and the short list of special opcodes in the switch
81467	** below need to be considered. The mkopcodeh.tcl generator script groups
81468	** all these opcodes together near the front of the opcode list. Skip
81469	** any opcode that does not need processing by virtual of the fact that
81470	** it is larger than SQLITE_MX_JUMP_OPCODE, as a performance optimization.
	@@ -81489,14 +81488,10 @@
81489	case OP_JournalMode: {
81490	p->readOnly = 0;
81491	p->bIsReader = 1;
81492	break;
81493	}
81494	case OP_Init: {
81495	assert( pOp->p2>=0 );
81496	goto resolve_p2_values_loop_exit;
81497	}
81498	#ifndef SQLITE_OMIT_VIRTUALTABLE
81499	case OP_VUpdate: {
81500	if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
81501	break;
81502	}
	@@ -81525,14 +81520,13 @@
81525	/* The mkopcodeh.tcl script has so arranged things that the only
81526	** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
81527	** have non-negative values for P2. */
81528	assert( (sqlite3OpcodeProperty[pOp->opcode]&OPFLG_JUMP)==0 \|\| pOp->p2>=0);
81529	}
81530	assert( pOp>p->aOp );
81531	pOp--;
81532	}
81533	resolve_p2_values_loop_exit:
81534	if( aLabel ){
81535	sqlite3DbFreeNN(p->db, pParse->aLabel);
81536	pParse->aLabel = 0;
81537	}
81538	pParse->nLabel = 0;
	@@ -86054,13 +86048,11 @@
86054	Vdbe v = (Vdbe)pStmt;
86055	sqlite3 *db = v->db;
86056	if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT;
86057	sqlite3_mutex_enter(db->mutex);
86058	checkProfileCallback(db, v);
86059	assert( v->eVdbeState>=VDBE_READY_STATE );
86060	rc = sqlite3VdbeReset(v);
86061	sqlite3VdbeDelete(v);
86062	rc = sqlite3ApiExit(db, rc);
86063	sqlite3LeaveMutexAndCloseZombie(db);
86064	}
86065	return rc;
86066	}
	@@ -90949,18 +90941,15 @@
90949	**
90950	** Check the cursor P1 to see if it is currently pointing at a NULL row.
90951	** If it is, then set register P3 to NULL and jump immediately to P2.
90952	** If P1 is not on a NULL row, then fall through without making any
90953	** changes.
90954	**
90955	** If P1 is not an open cursor, then this opcode is a no-op.
90956	*/
90957	case OP_IfNullRow: { /* jump */
90958	VdbeCursor *pC;
90959	assert( pOp->p1>=0 && pOp->p1<p->nCursor );
90960	pC = p->apCsr[pOp->p1];
90961	if( ALWAYS(pC) && pC->nullRow ){
90962	sqlite3VdbeMemSetNull(aMem + pOp->p3);
90963	goto jump_to_p2;
90964	}
90965	break;
90966	}
	@@ -101549,37 +101538,27 @@
101549	pDup = sqlite3ExprDup(db, pOrig, 0);
101550	if( db->mallocFailed ){
101551	sqlite3ExprDelete(db, pDup);
101552	pDup = 0;
101553	}else{

101554	incrAggFunctionDepth(pDup, nSubquery);
101555	if( pExpr->op==TK_COLLATE ){
101556	assert( !ExprHasProperty(pExpr, EP_IntValue) );
101557	pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken);
101558	}
101559
101560	/* Before calling sqlite3ExprDelete(), set the EP_Static flag. This
101561	** prevents ExprDelete() from deleting the Expr structure itself,
101562	** allowing it to be repopulated by the memcpy() on the following line.
101563	** The pExpr->u.zToken might point into memory that will be freed by the
101564	** sqlite3DbFree(db, pDup) on the last line of this block, so be sure to
101565	** make a copy of the token before doing the sqlite3DbFree().
101566	*/
101567	ExprSetProperty(pExpr, EP_Static);
101568	sqlite3ExprDelete(db, pExpr);
101569	memcpy(pExpr, pDup, sizeof(*pExpr));
101570	if( !ExprHasProperty(pExpr, EP_IntValue) && pExpr->u.zToken!=0 ){
101571	assert( (pExpr->flags & (EP_Reduced\|EP_TokenOnly))==0 );
101572	pExpr->u.zToken = sqlite3DbStrDup(db, pExpr->u.zToken);
101573	pExpr->flags \|= EP_MemToken;
101574	}
101575	if( ExprHasProperty(pExpr, EP_WinFunc) ){
101576	if( ALWAYS(pExpr->y.pWin!=0) ){
101577	pExpr->y.pWin->pOwner = pExpr;
101578	}
101579	}
101580	sqlite3DbFree(db, pDup);


101581	}
101582	}
101583
101584	/*
101585	** Subqueries stores the original database, table and column names for their
	@@ -137363,10 +137342,13 @@
137363	}
137364
137365	/*
137366	** Return a pointer to a string containing the 'declaration type' of the
137367	** expression pExpr. The string may be treated as static by the caller.



137368	**
137369	** The declaration type is the exact datatype definition extracted from the
137370	** original CREATE TABLE statement if the expression is a column. The
137371	** declaration type for a ROWID field is INTEGER. Exactly when an expression
137372	** is considered a column can be complex in the presence of subqueries. The
	@@ -139609,12 +139591,11 @@
139609	**
139610	** (3) If the subquery is the right operand of a LEFT JOIN then
139611	** (3a) the subquery may not be a join and
139612	** (3b) the FROM clause of the subquery may not contain a virtual
139613	** table and
139614	** (3c) The outer query may not have a GROUP BY. (This limitation is
139615	** due to how TK_IF_NULL_ROW works. FIX ME!)
139616	** (3d) the outer query may not be DISTINCT.
139617	** See also (26) for restrictions on RIGHT JOIN.
139618	**
139619	** (4) The subquery can not be DISTINCT.
139620	**
	@@ -139822,17 +139803,22 @@
139822	**
139823	** (t1 LEFT OUTER JOIN t2) JOIN t3
139824	**
139825	** which is not at all the same thing.
139826	**





139827	** See also tickets #306, #350, and #3300.
139828	*/
139829	if( (pSubitem->fg.jointype & (JT_OUTER\|JT_LTORJ))!=0 ){
139830	if( pSubSrc->nSrc>1 /* (3a) */

139831	\|\| IsVirtual(pSubSrc->a[0].pTab) /* (3b) */
139832	\|\| (p->selFlags & SF_Distinct)!=0 /* (3d) */
139833	\|\| (p->pGroupBy!=0) /* (3c) */
139834	\|\| (pSubitem->fg.jointype & JT_RIGHT)!=0 /* (26) */
139835	){
139836	return 0;
139837	}
139838	isOuterJoin = 1;
	@@ -140747,11 +140733,10 @@
140747	if( p->pWhere
140748	\|\| p->pEList->nExpr!=1
140749	\|\| p->pSrc->nSrc!=1
140750	\|\| p->pSrc->a[0].pSelect
140751	\|\| pAggInfo->nFunc!=1
140752	\|\| p->pHaving
140753	){
140754	return 0;
140755	}
140756	pTab = p->pSrc->a[0].pTab;
140757	assert( pTab!=0 );
	@@ -156143,22 +156128,16 @@
156143	}
156144	}
156145	}
156146
156147	/*
156148	** Deallocate internal memory used by a WhereLoop object. Leave the
156149	** object in an initialized state, as if it had been newly allocated.
156150	*/
156151	static void whereLoopClear(sqlite3 db, WhereLoop p){
156152	if( p->aLTerm!=p->aLTermSpace ){
156153	sqlite3DbFreeNN(db, p->aLTerm);
156154	p->aLTerm = p->aLTermSpace;
156155	p->nLSlot = ArraySize(p->aLTermSpace);
156156	}
156157	whereLoopClearUnion(db, p);
156158	p->nLTerm = 0;
156159	p->wsFlags = 0;
156160	}
156161
156162	/*
156163	** Increase the memory allocation for pLoop->aLTerm[] to be at least n.
156164	*/
	@@ -156178,13 +156157,11 @@
156178	/*
156179	** Transfer content from the second pLoop into the first.
156180	*/
156181	static int whereLoopXfer(sqlite3 db, WhereLoop pTo, WhereLoop *pFrom){
156182	whereLoopClearUnion(db, pTo);
156183	if( pFrom->nLTerm > pTo->nLSlot
156184	&& whereLoopResize(db, pTo, pFrom->nLTerm)
156185	){
156186	memset(pTo, 0, WHERE_LOOP_XFER_SZ);
156187	return SQLITE_NOMEM_BKPT;
156188	}
156189	memcpy(pTo, pFrom, WHERE_LOOP_XFER_SZ);
156190	memcpy(pTo->aLTerm, pFrom->aLTerm, pTo->nLTerm*sizeof(pTo->aLTerm[0]));
	@@ -156833,15 +156810,11 @@
156833	pNew->wsFlags = saved_wsFlags;
156834	pNew->u.btree.nEq = saved_nEq;
156835	pNew->u.btree.nBtm = saved_nBtm;
156836	pNew->u.btree.nTop = saved_nTop;
156837	pNew->nLTerm = saved_nLTerm;
156838	if( pNew->nLTerm>=pNew->nLSlot
156839	&& whereLoopResize(db, pNew, pNew->nLTerm+1)
156840	){
156841	break; /* OOM while trying to enlarge the pNew->aLTerm array */
156842	}
156843	pNew->aLTerm[pNew->nLTerm++] = pTerm;
156844	pNew->prereq = (saved_prereq \| pTerm->prereqRight) & ~pNew->maskSelf;
156845
156846	assert( nInMul==0
156847	\|\| (pNew->wsFlags & WHERE_COLUMN_NULL)!=0
	@@ -156930,43 +156903,42 @@
156930	}
156931	}
156932	if( scan.iEquiv>1 ) pNew->wsFlags \|= WHERE_TRANSCONS;
156933	}else if( eOp & WO_ISNULL ){
156934	pNew->wsFlags \|= WHERE_COLUMN_NULL;





















156935	}else{
156936	int nVecLen = whereRangeVectorLen(




156937	pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
156938	);
156939	if( eOp & (WO_GT\|WO_GE) ){
156940	testcase( eOp & WO_GT );
156941	testcase( eOp & WO_GE );
156942	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
156943	pNew->u.btree.nBtm = nVecLen;
156944	pBtm = pTerm;
156945	pTop = 0;
156946	if( pTerm->wtFlags & TERM_LIKEOPT ){
156947	/* Range constraints that come from the LIKE optimization are
156948	** always used in pairs. */
156949	pTop = &pTerm[1];
156950	assert( (pTop-(pTerm->pWC->a))<pTerm->pWC->nTerm );
156951	assert( pTop->wtFlags & TERM_LIKEOPT );
156952	assert( pTop->eOperator==WO_LT );
156953	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
156954	pNew->aLTerm[pNew->nLTerm++] = pTop;
156955	pNew->wsFlags \|= WHERE_TOP_LIMIT;
156956	pNew->u.btree.nTop = 1;
156957	}
156958	}else{
156959	assert( eOp & (WO_LT\|WO_LE) );
156960	testcase( eOp & WO_LT );
156961	testcase( eOp & WO_LE );
156962	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
156963	pNew->u.btree.nTop = nVecLen;
156964	pTop = pTerm;
156965	pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
156966	pNew->aLTerm[pNew->nLTerm-2] : 0;
156967	}
156968	}
156969
156970	/* At this point pNew->nOut is set to the number of rows expected to
156971	** be visited by the index scan before considering term pTerm, or the
156972	** values of nIn and nInMul. In other words, assuming that all
	@@ -158134,17 +158106,11 @@
158134	WhereLoop *pNew;
158135
158136
158137	/* Loop over the tables in the join, from left to right */
158138	pNew = pBuilder->pNew;
158139
158140	/* Verify that pNew has already been initialized */
158141	assert( pNew->nLTerm==0 );
158142	assert( pNew->wsFlags==0 );
158143	assert( pNew->nLSlot>=ArraySize(pNew->aLTermSpace) );
158144	assert( pNew->aLTerm!=0 );
158145
158146	pBuilder->iPlanLimit = SQLITE_QUERY_PLANNER_LIMIT;
158147	for(iTab=0, pItem=pTabList->a; pItem<pEnd; iTab++, pItem++){
158148	Bitmask mUnusable = 0;
158149	pNew->iTab = iTab;
158150	pBuilder->iPlanLimit += SQLITE_QUERY_PLANNER_LIMIT_INCR;
	@@ -158737,13 +158703,13 @@
158737	for(ii=0, pFrom=aFrom; ii<nFrom; ii++, pFrom++){
158738	for(pWLoop=pWInfo->pLoops; pWLoop; pWLoop=pWLoop->pNextLoop){
158739	LogEst nOut; /* Rows visited by (pFrom+pWLoop) */
158740	LogEst rCost; /* Cost of path (pFrom+pWLoop) */
158741	LogEst rUnsorted; /* Unsorted cost of (pFrom+pWLoop) */
158742	i8 isOrdered; /* isOrdered for (pFrom+pWLoop) */
158743	Bitmask maskNew; /* Mask of src visited by (..) */
158744	Bitmask revMask; /* Mask of rev-order loops for (..) */
158745
158746	if( (pWLoop->prereq & ~pFrom->maskLoop)!=0 ) continue;
158747	if( (pWLoop->maskSelf & pFrom->maskLoop)!=0 ) continue;
158748	if( (pWLoop->wsFlags & WHERE_AUTO_INDEX)!=0 && pFrom->nRow<3 ){
158749	/* Do not use an automatic index if the this loop is expected
	@@ -158758,13 +158724,11 @@
158758	** Compute its cost */
158759	rUnsorted = sqlite3LogEstAdd(pWLoop->rSetup,pWLoop->rRun + pFrom->nRow);
158760	rUnsorted = sqlite3LogEstAdd(rUnsorted, pFrom->rUnsorted);
158761	nOut = pFrom->nRow + pWLoop->nOut;
158762	maskNew = pFrom->maskLoop \| pWLoop->maskSelf;
158763	isOrdered = pFrom->isOrdered;
158764	if( isOrdered<0 ){
158765	revMask = 0;
158766	isOrdered = wherePathSatisfiesOrderBy(pWInfo,
158767	pWInfo->pOrderBy, pFrom, pWInfo->wctrlFlags,
158768	iLoop, pWLoop, &revMask);
158769	}else{
158770	revMask = pFrom->revLoop;
	@@ -212539,16 +212503,15 @@
212539	*/
212540	static int dbpageBegin(sqlite3_vtab *pVtab){
212541	DbpageTable pTab = (DbpageTable )pVtab;
212542	sqlite3 *db = pTab->db;
212543	int i;
212544	int rc = SQLITE_OK;
212545	for(i=0; rc==SQLITE_OK && i<db->nDb; i++){
212546	Btree *pBt = db->aDb[i].pBt;
212547	if( pBt ) rc = sqlite3BtreeBeginTrans(pBt, 1, 0);
212548	}
212549	return rc;
212550	}
212551
212552
212553	/*
212554	** Invoke this routine to register the "dbpage" virtual table module
	@@ -236671,11 +236634,11 @@
236671	int nArg, /* Number of args */
236672	sqlite3_value *apUnused / Function arguments */
236673	){
236674	assert( nArg==0 );
236675	UNUSED_PARAM2(nArg, apUnused);
236676	sqlite3_result_text(pCtx, "fts5: 2022-07-18 19:32:30 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a", -1, SQLITE_TRANSIENT);
236677	}
236678
236679	/*
236680	** Return true if zName is the extension on one of the shadow tables used
236681	** by this module.
236682

	--- 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.39.2. 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.
	@@ -450,13 +450,13 @@
450	**
451	** See also: [sqlite3_libversion()],
452	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453	** [sqlite_version()] and [sqlite_source_id()].
454	*/
455	#define SQLITE_VERSION "3.39.2"
456	#define SQLITE_VERSION_NUMBER 3039002
457	#define SQLITE_SOURCE_ID "2022-07-21 12:26:01 9141e873c575b049ce7aeaf313d05966f1966087caf33a6c80d2416a28571a21"
458
459	/*
460	** CAPI3REF: Run-Time Library Version Numbers
461	** KEYWORDS: sqlite3_version sqlite3_sourceid
462	**
	@@ -15553,67 +15553,67 @@
15553	#define OP_Checkpoint 3
15554	#define OP_JournalMode 4
15555	#define OP_Vacuum 5
15556	#define OP_VFilter 6 /* jump, synopsis: iplan=r[P3] zplan='P4' */
15557	#define OP_VUpdate 7 /* synopsis: data=r[P3@P2] */
15558	#define OP_Goto 8 /* jump */
15559	#define OP_Gosub 9 /* jump */
15560	#define OP_InitCoroutine 10 /* jump */
15561	#define OP_Yield 11 /* jump */
15562	#define OP_MustBeInt 12 /* jump */
15563	#define OP_Jump 13 /* jump */
15564	#define OP_Once 14 /* jump */
15565	#define OP_If 15 /* jump */
15566	#define OP_IfNot 16 /* jump */
15567	#define OP_IsNullOrType 17 /* jump, synopsis: if typeof(r[P1]) IN (P3,5) goto P2 */
15568	#define OP_IfNullRow 18 /* jump, synopsis: if P1.nullRow then r[P3]=NULL, goto P2 */
15569	#define OP_Not 19 /* same as TK_NOT, synopsis: r[P2]= !r[P1] */
15570	#define OP_SeekLT 20 /* jump, synopsis: key=r[P3@P4] */
15571	#define OP_SeekLE 21 /* jump, synopsis: key=r[P3@P4] */
15572	#define OP_SeekGE 22 /* jump, synopsis: key=r[P3@P4] */
15573	#define OP_SeekGT 23 /* jump, synopsis: key=r[P3@P4] */
15574	#define OP_IfNotOpen 24 /* jump, synopsis: if( !csr[P1] ) goto P2 */
15575	#define OP_IfNoHope 25 /* jump, synopsis: key=r[P3@P4] */
15576	#define OP_NoConflict 26 /* jump, synopsis: key=r[P3@P4] */
15577	#define OP_NotFound 27 /* jump, synopsis: key=r[P3@P4] */
15578	#define OP_Found 28 /* jump, synopsis: key=r[P3@P4] */
15579	#define OP_SeekRowid 29 /* jump, synopsis: intkey=r[P3] */
15580	#define OP_NotExists 30 /* jump, synopsis: intkey=r[P3] */
15581	#define OP_Last 31 /* jump */
15582	#define OP_IfSmaller 32 /* jump */
15583	#define OP_SorterSort 33 /* jump */
15584	#define OP_Sort 34 /* jump */
15585	#define OP_Rewind 35 /* jump */
15586	#define OP_SorterNext 36 /* jump */
15587	#define OP_Prev 37 /* jump */
15588	#define OP_Next 38 /* jump */
15589	#define OP_IdxLE 39 /* jump, synopsis: key=r[P3@P4] */
15590	#define OP_IdxGT 40 /* jump, synopsis: key=r[P3@P4] */
15591	#define OP_IdxLT 41 /* jump, synopsis: key=r[P3@P4] */
15592	#define OP_IdxGE 42 /* jump, synopsis: key=r[P3@P4] */
15593	#define OP_Or 43 /* same as TK_OR, synopsis: r[P3]=(r[P1] \|\| r[P2]) */
15594	#define OP_And 44 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
15595	#define OP_RowSetRead 45 /* jump, synopsis: r[P3]=rowset(P1) */
15596	#define OP_RowSetTest 46 /* jump, synopsis: if r[P3] in rowset(P1) goto P2 */
15597	#define OP_Program 47 /* jump */
15598	#define OP_FkIfZero 48 /* jump, synopsis: if fkctr[P1]==0 goto P2 */
15599	#define OP_IfPos 49 /* jump, synopsis: if r[P1]>0 then r[P1]-=P3, goto P2 */
15600	#define OP_IsNull 50 /* jump, same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
15601	#define OP_NotNull 51 /* jump, same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
15602	#define OP_Ne 52 /* jump, same as TK_NE, synopsis: IF r[P3]!=r[P1] */
15603	#define OP_Eq 53 /* jump, same as TK_EQ, synopsis: IF r[P3]==r[P1] */
15604	#define OP_Gt 54 /* jump, same as TK_GT, synopsis: IF r[P3]>r[P1] */
15605	#define OP_Le 55 /* jump, same as TK_LE, synopsis: IF r[P3]<=r[P1] */
15606	#define OP_Lt 56 /* jump, same as TK_LT, synopsis: IF r[P3]<r[P1] */
15607	#define OP_Ge 57 /* jump, same as TK_GE, synopsis: IF r[P3]>=r[P1] */
15608	#define OP_ElseEq 58 /* jump, same as TK_ESCAPE */
15609	#define OP_IfNotZero 59 /* jump, synopsis: if r[P1]!=0 then r[P1]--, goto P2 */
15610	#define OP_DecrJumpZero 60 /* jump, synopsis: if (--r[P1])==0 goto P2 */
15611	#define OP_IncrVacuum 61 /* jump */
15612	#define OP_VNext 62 /* jump */
15613	#define OP_Filter 63 /* jump, synopsis: if key(P3@P4) not in filter(P1) goto P2 */
15614	#define OP_Init 64 /* jump, synopsis: Start at P2 */
15615	#define OP_PureFunc 65 /* synopsis: r[P3]=func(r[P2@NP]) */
15616	#define OP_Function 66 /* synopsis: r[P3]=func(r[P2@NP]) */
15617	#define OP_Return 67
15618	#define OP_EndCoroutine 68
15619	#define OP_HaltIfNull 69 /* synopsis: if r[P3]=null halt */
	@@ -15745,17 +15745,17 @@
15745	#define OPFLG_IN3 0x08 /* in3: P3 is an input */
15746	#define OPFLG_OUT2 0x10 /* out2: P2 is an output */
15747	#define OPFLG_OUT3 0x20 /* out3: P3 is an output */
15748	#define OPFLG_INITIALIZER {\
15749	/* 0 */ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00,\
15750	/* 8 */ 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, 0x03,\
15751	/* 16 */ 0x03, 0x03, 0x01, 0x12, 0x09, 0x09, 0x09, 0x09,\
15752	/* 24 */ 0x01, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x01,\
15753	/* 32 */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\
15754	/* 40 */ 0x01, 0x01, 0x01, 0x26, 0x26, 0x23, 0x0b, 0x01,\
15755	/* 48 */ 0x01, 0x03, 0x03, 0x03, 0x0b, 0x0b, 0x0b, 0x0b,\
15756	/* 56 */ 0x0b, 0x0b, 0x01, 0x03, 0x03, 0x01, 0x01, 0x01,\
15757	/* 64 */ 0x01, 0x00, 0x00, 0x02, 0x02, 0x08, 0x00, 0x10,\
15758	/* 72 */ 0x10, 0x10, 0x00, 0x10, 0x00, 0x10, 0x10, 0x00,\
15759	/* 80 */ 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x02, 0x02,\
15760	/* 88 */ 0x02, 0x00, 0x00, 0x12, 0x1e, 0x20, 0x00, 0x00,\
15761	/* 96 */ 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x26, 0x26,\
	@@ -29561,17 +29561,12 @@
29561	if( db->nVdbeExec>0 ){
29562	AtomicStore(&db->u1.isInterrupted, 1);
29563	}
29564	DisableLookaside;
29565	if( db->pParse ){

29566	sqlite3ErrorMsg(db->pParse, "out of memory");
29567	db->pParse->rc = SQLITE_NOMEM_BKPT;




29568	}
29569	}
29570	return 0;
29571	}
29572
	@@ -35280,67 +35275,67 @@
35275	/* 3 */ "Checkpoint" OpHelp(""),
35276	/* 4 */ "JournalMode" OpHelp(""),
35277	/* 5 */ "Vacuum" OpHelp(""),
35278	/* 6 */ "VFilter" OpHelp("iplan=r[P3] zplan='P4'"),
35279	/* 7 */ "VUpdate" OpHelp("data=r[P3@P2]"),
35280	/* 8 */ "Goto" OpHelp(""),
35281	/* 9 */ "Gosub" OpHelp(""),
35282	/* 10 */ "InitCoroutine" OpHelp(""),
35283	/* 11 */ "Yield" OpHelp(""),
35284	/* 12 */ "MustBeInt" OpHelp(""),
35285	/* 13 */ "Jump" OpHelp(""),
35286	/* 14 */ "Once" OpHelp(""),
35287	/* 15 */ "If" OpHelp(""),
35288	/* 16 */ "IfNot" OpHelp(""),
35289	/* 17 */ "IsNullOrType" OpHelp("if typeof(r[P1]) IN (P3,5) goto P2"),
35290	/* 18 */ "IfNullRow" OpHelp("if P1.nullRow then r[P3]=NULL, goto P2"),
35291	/* 19 */ "Not" OpHelp("r[P2]= !r[P1]"),
35292	/* 20 */ "SeekLT" OpHelp("key=r[P3@P4]"),
35293	/* 21 */ "SeekLE" OpHelp("key=r[P3@P4]"),
35294	/* 22 */ "SeekGE" OpHelp("key=r[P3@P4]"),
35295	/* 23 */ "SeekGT" OpHelp("key=r[P3@P4]"),
35296	/* 24 */ "IfNotOpen" OpHelp("if( !csr[P1] ) goto P2"),
35297	/* 25 */ "IfNoHope" OpHelp("key=r[P3@P4]"),
35298	/* 26 */ "NoConflict" OpHelp("key=r[P3@P4]"),
35299	/* 27 */ "NotFound" OpHelp("key=r[P3@P4]"),
35300	/* 28 */ "Found" OpHelp("key=r[P3@P4]"),
35301	/* 29 */ "SeekRowid" OpHelp("intkey=r[P3]"),
35302	/* 30 */ "NotExists" OpHelp("intkey=r[P3]"),
35303	/* 31 */ "Last" OpHelp(""),
35304	/* 32 */ "IfSmaller" OpHelp(""),
35305	/* 33 */ "SorterSort" OpHelp(""),
35306	/* 34 */ "Sort" OpHelp(""),
35307	/* 35 */ "Rewind" OpHelp(""),
35308	/* 36 */ "SorterNext" OpHelp(""),
35309	/* 37 */ "Prev" OpHelp(""),
35310	/* 38 */ "Next" OpHelp(""),
35311	/* 39 */ "IdxLE" OpHelp("key=r[P3@P4]"),
35312	/* 40 */ "IdxGT" OpHelp("key=r[P3@P4]"),
35313	/* 41 */ "IdxLT" OpHelp("key=r[P3@P4]"),
35314	/* 42 */ "IdxGE" OpHelp("key=r[P3@P4]"),
35315	/* 43 */ "Or" OpHelp("r[P3]=(r[P1] \|\| r[P2])"),
35316	/* 44 */ "And" OpHelp("r[P3]=(r[P1] && r[P2])"),
35317	/* 45 */ "RowSetRead" OpHelp("r[P3]=rowset(P1)"),
35318	/* 46 */ "RowSetTest" OpHelp("if r[P3] in rowset(P1) goto P2"),
35319	/* 47 */ "Program" OpHelp(""),
35320	/* 48 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
35321	/* 49 */ "IfPos" OpHelp("if r[P1]>0 then r[P1]-=P3, goto P2"),
35322	/* 50 */ "IsNull" OpHelp("if r[P1]==NULL goto P2"),
35323	/* 51 */ "NotNull" OpHelp("if r[P1]!=NULL goto P2"),
35324	/* 52 */ "Ne" OpHelp("IF r[P3]!=r[P1]"),
35325	/* 53 */ "Eq" OpHelp("IF r[P3]==r[P1]"),
35326	/* 54 */ "Gt" OpHelp("IF r[P3]>r[P1]"),
35327	/* 55 */ "Le" OpHelp("IF r[P3]<=r[P1]"),
35328	/* 56 */ "Lt" OpHelp("IF r[P3]<r[P1]"),
35329	/* 57 */ "Ge" OpHelp("IF r[P3]>=r[P1]"),
35330	/* 58 */ "ElseEq" OpHelp(""),
35331	/* 59 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]--, goto P2"),
35332	/* 60 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
35333	/* 61 */ "IncrVacuum" OpHelp(""),
35334	/* 62 */ "VNext" OpHelp(""),
35335	/* 63 */ "Filter" OpHelp("if key(P3@P4) not in filter(P1) goto P2"),
35336	/* 64 */ "Init" OpHelp("Start at P2"),
35337	/* 65 */ "PureFunc" OpHelp("r[P3]=func(r[P2@NP])"),
35338	/* 66 */ "Function" OpHelp("r[P3]=func(r[P2@NP])"),
35339	/* 67 */ "Return" OpHelp(""),
35340	/* 68 */ "EndCoroutine" OpHelp(""),
35341	/* 69 */ "HaltIfNull" OpHelp("if r[P3]=null halt"),
	@@ -68314,10 +68309,11 @@
68309	assert( sqlite3PagerIswriteable(pPage->pDbPage) );
68310	assert( pPage->pBt!=0 );
68311	assert( pPage->pBt->usableSize <= SQLITE_MAX_PAGE_SIZE );
68312	assert( pPage->nOverflow==0 );
68313	assert( sqlite3_mutex_held(pPage->pBt->mutex) );
68314	temp = 0;
68315	src = data = pPage->aData;
68316	hdr = pPage->hdrOffset;
68317	cellOffset = pPage->cellOffset;
68318	nCell = pPage->nCell;
68319	assert( nCell==get2byte(&data[hdr+3]) \|\| CORRUPT_DB );
	@@ -68368,42 +68364,43 @@
68364	}
68365
68366	cbrk = usableSize;
68367	iCellLast = usableSize - 4;
68368	iCellStart = get2byte(&data[hdr+5]);
68369	for(i=0; i<nCell; i++){
68370	u8 pAddr; / The i-th cell pointer */
68371	pAddr = &data[cellOffset + i*2];
68372	pc = get2byte(pAddr);
68373	testcase( pc==iCellFirst );
68374	testcase( pc==iCellLast );
68375	/* These conditions have already been verified in btreeInitPage()
68376	** if PRAGMA cell_size_check=ON.
68377	*/
68378	if( pc<iCellStart \|\| pc>iCellLast ){
68379	return SQLITE_CORRUPT_PAGE(pPage);
68380	}
68381	assert( pc>=iCellStart && pc<=iCellLast );
68382	size = pPage->xCellSize(pPage, &src[pc]);
68383	cbrk -= size;
68384	if( cbrk<iCellStart \|\| pc+size>usableSize ){
68385	return SQLITE_CORRUPT_PAGE(pPage);
68386	}
68387	assert( cbrk+size<=usableSize && cbrk>=iCellStart );
68388	testcase( cbrk+size==usableSize );
68389	testcase( pc+size==usableSize );
68390	put2byte(pAddr, cbrk);
68391	if( temp==0 ){
68392	if( cbrk==pc ) continue;
68393	temp = sqlite3PagerTempSpace(pPage->pBt->pPager);
68394	memcpy(&temp[iCellStart], &data[iCellStart], usableSize - iCellStart);
68395	src = temp;
68396	}
68397	memcpy(&data[cbrk], &src[pc], size);
68398	}
68399	data[hdr+7] = 0;
68400
68401	defragment_out:
68402	assert( pPage->nFree>=0 );
68403	if( data[hdr+7]+cbrk-iCellFirst!=pPage->nFree ){
68404	return SQLITE_CORRUPT_PAGE(pPage);
68405	}
68406	assert( cbrk>=iCellFirst );
	@@ -68472,13 +68469,13 @@
68469	return &aData[pc + x];
68470	}
68471	iAddr = pc;
68472	pTmp = &aData[pc];
68473	pc = get2byte(pTmp);
68474	if( pc<=iAddr+size ){
68475	if( pc ){
68476	/* The next slot in the chain is not past the end of the current slot */
68477	*pRc = SQLITE_CORRUPT_PAGE(pPg);
68478	}
68479	return 0;
68480	}
68481	}
	@@ -68626,11 +68623,11 @@
68623	iPtr = hdr + 1;
68624	if( data[iPtr+1]==0 && data[iPtr]==0 ){
68625	iFreeBlk = 0; /* Shortcut for the case when the freelist is empty */
68626	}else{
68627	while( (iFreeBlk = get2byte(&data[iPtr]))<iStart ){
68628	if( iFreeBlk<iPtr+4 ){
68629	if( iFreeBlk==0 ) break; /* TH3: corrupt082.100 */
68630	return SQLITE_CORRUPT_PAGE(pPage);
68631	}
68632	iPtr = iFreeBlk;
68633	}
	@@ -69108,11 +69105,13 @@
69105	if( pCur ){
69106	pCur->iPage--;
69107	pCur->pPage = pCur->apPage[pCur->iPage];
69108	}
69109	testcase( pgno==0 );
69110	assert( pgno!=0 \|\| rc==SQLITE_CORRUPT
69111	\|\| rc==SQLITE_IOERR_NOMEM
69112	\|\| rc==SQLITE_NOMEM );
69113	return rc;
69114	}
69115
69116	/*
69117	** Release a MemPage. This should be called once for each prior
	@@ -72050,10 +72049,12 @@
72049	** the new child page does not match the flags field of the parent (i.e.
72050	** if an intkey page appears to be the parent of a non-intkey page, or
72051	** vice-versa).
72052	*/
72053	static int moveToChild(BtCursor *pCur, u32 newPgno){
72054	BtShared *pBt = pCur->pBt;
72055
72056	assert( cursorOwnsBtShared(pCur) );
72057	assert( pCur->eState==CURSOR_VALID );
72058	assert( pCur->iPage<BTCURSOR_MAX_DEPTH );
72059	assert( pCur->iPage>=0 );
72060	if( pCur->iPage>=(BTCURSOR_MAX_DEPTH-1) ){
	@@ -72063,12 +72064,11 @@
72064	pCur->curFlags &= ~(BTCF_ValidNKey\|BTCF_ValidOvfl);
72065	pCur->aiIdx[pCur->iPage] = pCur->ix;
72066	pCur->apPage[pCur->iPage] = pCur->pPage;
72067	pCur->ix = 0;
72068	pCur->iPage++;
72069	return getAndInitPage(pBt, newPgno, &pCur->pPage, pCur, pCur->curPagerFlags);

72070	}
72071
72072	#ifdef SQLITE_DEBUG
72073	/*
72074	** Page pParent is an internal (non-leaf) tree page. This function
	@@ -72170,11 +72170,11 @@
72170	assert( pCur->skipNext!=SQLITE_OK );
72171	return pCur->skipNext;
72172	}
72173	sqlite3BtreeClearCursor(pCur);
72174	}
72175	rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->pPage,
72176	0, pCur->curPagerFlags);
72177	if( rc!=SQLITE_OK ){
72178	pCur->eState = CURSOR_INVALID;
72179	return rc;
72180	}
	@@ -73811,10 +73811,16 @@
73811	data = pPage->aData;
73812	ptr = &pPage->aCellIdx[2*idx];
73813	assert( pPage->pBt->usableSize > (u32)(ptr-data) );
73814	pc = get2byte(ptr);
73815	hdr = pPage->hdrOffset;
73816	#if 0 /* Not required. Omit for efficiency */
73817	if( pc<hdr+pPage->nCell*2 ){
73818	*pRC = SQLITE_CORRUPT_BKPT;
73819	return;
73820	}
73821	#endif
73822	testcase( pc==(u32)get2byte(&data[hdr+5]) );
73823	testcase( pc+sz==pPage->pBt->usableSize );
73824	if( pc+sz > pPage->pBt->usableSize ){
73825	*pRC = SQLITE_CORRUPT_BKPT;
73826	return;
	@@ -80761,18 +80767,11 @@
80767	return 0;
80768	}
80769	#endif
80770
80771	/*
80772	** Swap all content between two VDBE structures.







80773	*/
80774	SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe pA, Vdbe pB){
80775	Vdbe tmp, *pTmp;
80776	char *zTmp;
80777	assert( pA->db==pB->db );
	@@ -81459,12 +81458,12 @@
81458	Parse *pParse = p->pParse;
81459	int *aLabel = pParse->aLabel;
81460	p->readOnly = 1;
81461	p->bIsReader = 0;
81462	pOp = &p->aOp[p->nOp-1];
81463	while(1){
81464
81465	/* Only JUMP opcodes and the short list of special opcodes in the switch
81466	** below need to be considered. The mkopcodeh.tcl generator script groups
81467	** all these opcodes together near the front of the opcode list. Skip
81468	** any opcode that does not need processing by virtual of the fact that
81469	** it is larger than SQLITE_MX_JUMP_OPCODE, as a performance optimization.
	@@ -81489,14 +81488,10 @@
81488	case OP_JournalMode: {
81489	p->readOnly = 0;
81490	p->bIsReader = 1;
81491	break;
81492	}




81493	#ifndef SQLITE_OMIT_VIRTUALTABLE
81494	case OP_VUpdate: {
81495	if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
81496	break;
81497	}
	@@ -81525,14 +81520,13 @@
81520	/* The mkopcodeh.tcl script has so arranged things that the only
81521	** non-jump opcodes less than SQLITE_MX_JUMP_CODE are guaranteed to
81522	** have non-negative values for P2. */
81523	assert( (sqlite3OpcodeProperty[pOp->opcode]&OPFLG_JUMP)==0 \|\| pOp->p2>=0);
81524	}
81525	if( pOp==p->aOp ) break;
81526	pOp--;
81527	}

81528	if( aLabel ){
81529	sqlite3DbFreeNN(p->db, pParse->aLabel);
81530	pParse->aLabel = 0;
81531	}
81532	pParse->nLabel = 0;
	@@ -86054,13 +86048,11 @@
86048	Vdbe v = (Vdbe)pStmt;
86049	sqlite3 *db = v->db;
86050	if( vdbeSafety(v) ) return SQLITE_MISUSE_BKPT;
86051	sqlite3_mutex_enter(db->mutex);
86052	checkProfileCallback(db, v);
86053	rc = sqlite3VdbeFinalize(v);


86054	rc = sqlite3ApiExit(db, rc);
86055	sqlite3LeaveMutexAndCloseZombie(db);
86056	}
86057	return rc;
86058	}
	@@ -90949,18 +90941,15 @@
90941	**
90942	** Check the cursor P1 to see if it is currently pointing at a NULL row.
90943	** If it is, then set register P3 to NULL and jump immediately to P2.
90944	** If P1 is not on a NULL row, then fall through without making any
90945	** changes.


90946	*/
90947	case OP_IfNullRow: { /* jump */

90948	assert( pOp->p1>=0 && pOp->p1<p->nCursor );
90949	assert( p->apCsr[pOp->p1]!=0 );
90950	if( p->apCsr[pOp->p1]->nullRow ){
90951	sqlite3VdbeMemSetNull(aMem + pOp->p3);
90952	goto jump_to_p2;
90953	}
90954	break;
90955	}
	@@ -101549,37 +101538,27 @@
101538	pDup = sqlite3ExprDup(db, pOrig, 0);
101539	if( db->mallocFailed ){
101540	sqlite3ExprDelete(db, pDup);
101541	pDup = 0;
101542	}else{
101543	Expr temp;
101544	incrAggFunctionDepth(pDup, nSubquery);
101545	if( pExpr->op==TK_COLLATE ){
101546	assert( !ExprHasProperty(pExpr, EP_IntValue) );
101547	pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken);
101548	}
101549	memcpy(&temp, pDup, sizeof(Expr));
101550	memcpy(pDup, pExpr, sizeof(Expr));
101551	memcpy(pExpr, &temp, sizeof(Expr));













101552	if( ExprHasProperty(pExpr, EP_WinFunc) ){
101553	if( ALWAYS(pExpr->y.pWin!=0) ){
101554	pExpr->y.pWin->pOwner = pExpr;
101555	}
101556	}
101557	sqlite3ParserAddCleanup(pParse,
101558	(void()(sqlite3,void*))sqlite3ExprDelete,
101559	pDup);
101560	}
101561	}
101562
101563	/*
101564	** Subqueries stores the original database, table and column names for their
	@@ -137363,10 +137342,13 @@
137342	}
137343
137344	/*
137345	** Return a pointer to a string containing the 'declaration type' of the
137346	** expression pExpr. The string may be treated as static by the caller.
137347	**
137348	** Also try to estimate the size of the returned value and return that
137349	** result in *pEstWidth.
137350	**
137351	** The declaration type is the exact datatype definition extracted from the
137352	** original CREATE TABLE statement if the expression is a column. The
137353	** declaration type for a ROWID field is INTEGER. Exactly when an expression
137354	** is considered a column can be complex in the presence of subqueries. The
	@@ -139609,12 +139591,11 @@
139591	**
139592	** (3) If the subquery is the right operand of a LEFT JOIN then
139593	** (3a) the subquery may not be a join and
139594	** (3b) the FROM clause of the subquery may not contain a virtual
139595	** table and
139596	** (3c) the outer query may not be an aggregate.

139597	** (3d) the outer query may not be DISTINCT.
139598	** See also (26) for restrictions on RIGHT JOIN.
139599	**
139600	** (4) The subquery can not be DISTINCT.
139601	**
	@@ -139822,17 +139803,22 @@
139803	**
139804	** (t1 LEFT OUTER JOIN t2) JOIN t3
139805	**
139806	** which is not at all the same thing.
139807	**
139808	** If the subquery is the right operand of a LEFT JOIN, then the outer
139809	** query cannot be an aggregate. (3c) This is an artifact of the way
139810	** aggregates are processed - there is no mechanism to determine if
139811	** the LEFT JOIN table should be all-NULL.
139812	**
139813	** See also tickets #306, #350, and #3300.
139814	*/
139815	if( (pSubitem->fg.jointype & (JT_OUTER\|JT_LTORJ))!=0 ){
139816	if( pSubSrc->nSrc>1 /* (3a) */
139817	\|\| isAgg /* (3c) */
139818	\|\| IsVirtual(pSubSrc->a[0].pTab) /* (3b) */
139819	\|\| (p->selFlags & SF_Distinct)!=0 /* (3d) */

139820	\|\| (pSubitem->fg.jointype & JT_RIGHT)!=0 /* (26) */
139821	){
139822	return 0;
139823	}
139824	isOuterJoin = 1;
	@@ -140747,11 +140733,10 @@
140733	if( p->pWhere
140734	\|\| p->pEList->nExpr!=1
140735	\|\| p->pSrc->nSrc!=1
140736	\|\| p->pSrc->a[0].pSelect
140737	\|\| pAggInfo->nFunc!=1

140738	){
140739	return 0;
140740	}
140741	pTab = p->pSrc->a[0].pTab;
140742	assert( pTab!=0 );
	@@ -156143,22 +156128,16 @@
156128	}
156129	}
156130	}
156131
156132	/*
156133	** Deallocate internal memory used by a WhereLoop object

156134	*/
156135	static void whereLoopClear(sqlite3 db, WhereLoop p){
156136	if( p->aLTerm!=p->aLTermSpace ) sqlite3DbFreeNN(db, p->aLTerm);




156137	whereLoopClearUnion(db, p);
156138	whereLoopInit(p);

156139	}
156140
156141	/*
156142	** Increase the memory allocation for pLoop->aLTerm[] to be at least n.
156143	*/
	@@ -156178,13 +156157,11 @@
156157	/*
156158	** Transfer content from the second pLoop into the first.
156159	*/
156160	static int whereLoopXfer(sqlite3 db, WhereLoop pTo, WhereLoop *pFrom){
156161	whereLoopClearUnion(db, pTo);
156162	if( whereLoopResize(db, pTo, pFrom->nLTerm) ){


156163	memset(pTo, 0, WHERE_LOOP_XFER_SZ);
156164	return SQLITE_NOMEM_BKPT;
156165	}
156166	memcpy(pTo, pFrom, WHERE_LOOP_XFER_SZ);
156167	memcpy(pTo->aLTerm, pFrom->aLTerm, pTo->nLTerm*sizeof(pTo->aLTerm[0]));
	@@ -156833,15 +156810,11 @@
156810	pNew->wsFlags = saved_wsFlags;
156811	pNew->u.btree.nEq = saved_nEq;
156812	pNew->u.btree.nBtm = saved_nBtm;
156813	pNew->u.btree.nTop = saved_nTop;
156814	pNew->nLTerm = saved_nLTerm;
156815	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */




156816	pNew->aLTerm[pNew->nLTerm++] = pTerm;
156817	pNew->prereq = (saved_prereq \| pTerm->prereqRight) & ~pNew->maskSelf;
156818
156819	assert( nInMul==0
156820	\|\| (pNew->wsFlags & WHERE_COLUMN_NULL)!=0
	@@ -156930,43 +156903,42 @@
156903	}
156904	}
156905	if( scan.iEquiv>1 ) pNew->wsFlags \|= WHERE_TRANSCONS;
156906	}else if( eOp & WO_ISNULL ){
156907	pNew->wsFlags \|= WHERE_COLUMN_NULL;
156908	}else if( eOp & (WO_GT\|WO_GE) ){
156909	testcase( eOp & WO_GT );
156910	testcase( eOp & WO_GE );
156911	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
156912	pNew->u.btree.nBtm = whereRangeVectorLen(
156913	pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
156914	);
156915	pBtm = pTerm;
156916	pTop = 0;
156917	if( pTerm->wtFlags & TERM_LIKEOPT ){
156918	/* Range constraints that come from the LIKE optimization are
156919	** always used in pairs. */
156920	pTop = &pTerm[1];
156921	assert( (pTop-(pTerm->pWC->a))<pTerm->pWC->nTerm );
156922	assert( pTop->wtFlags & TERM_LIKEOPT );
156923	assert( pTop->eOperator==WO_LT );
156924	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
156925	pNew->aLTerm[pNew->nLTerm++] = pTop;
156926	pNew->wsFlags \|= WHERE_TOP_LIMIT;
156927	pNew->u.btree.nTop = 1;
156928	}
156929	}else{
156930	assert( eOp & (WO_LT\|WO_LE) );
156931	testcase( eOp & WO_LT );
156932	testcase( eOp & WO_LE );
156933	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
156934	pNew->u.btree.nTop = whereRangeVectorLen(
156935	pParse, pSrc->iCursor, pProbe, saved_nEq, pTerm
156936	);
156937	pTop = pTerm;
156938	pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
156939	pNew->aLTerm[pNew->nLTerm-2] : 0;


























156940	}
156941
156942	/* At this point pNew->nOut is set to the number of rows expected to
156943	** be visited by the index scan before considering term pTerm, or the
156944	** values of nIn and nInMul. In other words, assuming that all
	@@ -158134,17 +158106,11 @@
158106	WhereLoop *pNew;
158107
158108
158109	/* Loop over the tables in the join, from left to right */
158110	pNew = pBuilder->pNew;
158111	whereLoopInit(pNew);






158112	pBuilder->iPlanLimit = SQLITE_QUERY_PLANNER_LIMIT;
158113	for(iTab=0, pItem=pTabList->a; pItem<pEnd; iTab++, pItem++){
158114	Bitmask mUnusable = 0;
158115	pNew->iTab = iTab;
158116	pBuilder->iPlanLimit += SQLITE_QUERY_PLANNER_LIMIT_INCR;
	@@ -158737,13 +158703,13 @@
158703	for(ii=0, pFrom=aFrom; ii<nFrom; ii++, pFrom++){
158704	for(pWLoop=pWInfo->pLoops; pWLoop; pWLoop=pWLoop->pNextLoop){
158705	LogEst nOut; /* Rows visited by (pFrom+pWLoop) */
158706	LogEst rCost; /* Cost of path (pFrom+pWLoop) */
158707	LogEst rUnsorted; /* Unsorted cost of (pFrom+pWLoop) */
158708	i8 isOrdered = pFrom->isOrdered; /* isOrdered for (pFrom+pWLoop) */
158709	Bitmask maskNew; /* Mask of src visited by (..) */
158710	Bitmask revMask = 0; /* Mask of rev-order loops for (..) */
158711
158712	if( (pWLoop->prereq & ~pFrom->maskLoop)!=0 ) continue;
158713	if( (pWLoop->maskSelf & pFrom->maskLoop)!=0 ) continue;
158714	if( (pWLoop->wsFlags & WHERE_AUTO_INDEX)!=0 && pFrom->nRow<3 ){
158715	/* Do not use an automatic index if the this loop is expected
	@@ -158758,13 +158724,11 @@
158724	** Compute its cost */
158725	rUnsorted = sqlite3LogEstAdd(pWLoop->rSetup,pWLoop->rRun + pFrom->nRow);
158726	rUnsorted = sqlite3LogEstAdd(rUnsorted, pFrom->rUnsorted);
158727	nOut = pFrom->nRow + pWLoop->nOut;
158728	maskNew = pFrom->maskLoop \| pWLoop->maskSelf;

158729	if( isOrdered<0 ){

158730	isOrdered = wherePathSatisfiesOrderBy(pWInfo,
158731	pWInfo->pOrderBy, pFrom, pWInfo->wctrlFlags,
158732	iLoop, pWLoop, &revMask);
158733	}else{
158734	revMask = pFrom->revLoop;
	@@ -212539,16 +212503,15 @@
212503	*/
212504	static int dbpageBegin(sqlite3_vtab *pVtab){
212505	DbpageTable pTab = (DbpageTable )pVtab;
212506	sqlite3 *db = pTab->db;
212507	int i;
212508	for(i=0; i<db->nDb; i++){

212509	Btree *pBt = db->aDb[i].pBt;
212510	if( pBt ) sqlite3BtreeBeginTrans(pBt, 1, 0);
212511	}
212512	return SQLITE_OK;
212513	}
212514
212515
212516	/*
212517	** Invoke this routine to register the "dbpage" virtual table module
	@@ -236671,11 +236634,11 @@
236634	int nArg, /* Number of args */
236635	sqlite3_value *apUnused / Function arguments */
236636	){
236637	assert( nArg==0 );
236638	UNUSED_PARAM2(nArg, apUnused);
236639	sqlite3_result_text(pCtx, "fts5: 2022-07-21 12:26:01 9141e873c575b049ce7aeaf313d05966f1966087caf33a6c80d2416a28571a21", -1, SQLITE_TRANSIENT);
236640	}
236641
236642	/*
236643	** Return true if zName is the extension on one of the shadow tables used
236644	** by this module.
236645

M extsrc/sqlite3.h

+3 -3

		--- 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.40.0"
150		-#define SQLITE_VERSION_NUMBER 3040000
151		-#define SQLITE_SOURCE_ID "2022-07-18 19:32:30 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a"
	149	+#define SQLITE_VERSION "3.39.2"
	150	+#define SQLITE_VERSION_NUMBER 3039002
	151	+#define SQLITE_SOURCE_ID "2022-07-21 12:26:01 9141e873c575b049ce7aeaf313d05966f1966087caf33a6c80d2416a28571a21"
152	152
153	153	/*
154	154	** CAPI3REF: Run-Time Library Version Numbers
155	155	** KEYWORDS: sqlite3_version sqlite3_sourceid
156	156	**
157	157

	--- 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.40.0"
150	#define SQLITE_VERSION_NUMBER 3040000
151	#define SQLITE_SOURCE_ID "2022-07-18 19:32:30 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a"
152
153	/*
154	** CAPI3REF: Run-Time Library Version Numbers
155	** KEYWORDS: sqlite3_version sqlite3_sourceid
156	**
157

	--- 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.39.2"
150	#define SQLITE_VERSION_NUMBER 3039002
151	#define SQLITE_SOURCE_ID "2022-07-21 12:26:01 9141e873c575b049ce7aeaf313d05966f1966087caf33a6c80d2416a28571a21"
152
153	/*
154	** CAPI3REF: Run-Time Library Version Numbers
155	** KEYWORDS: sqlite3_version sqlite3_sourceid
156	**
157

Fossil SCM

Keyboard Shortcuts