Fossil SCM

merged in trunk.

stephan 2020-05-26 06:47 style-css-revamp merge

Commit fe018289e3a76d312c4a0f0ee575bf3ed3e23f8859a1e7d8768382a9bf1ad4ad

Parent 45341a2869324d1…

13 files changed +21 +13 -1 +6 +18 -13 +14 -6 +33 -17 +5 -2 +5 +167 -85 +3 -3 +1 -1 +22 -7 +6 -1

~ src/cgi.c ~ src/db.c ~ src/default_css.txt ~ src/doc.c ~ src/http_ssl.c ~ src/info.c ~ src/shell.c ~ src/sqlcmd.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/th_main.c ~ src/unversioned.c ~ www/changes.wiki

M src/cgi.c

+21

		--- src/cgi.c
		+++ src/cgi.c
		@@ -433,10 +433,31 @@
433	433	va_list ap;
434	434	va_start(ap, zFormat);
435	435	cgi_redirect(vmprintf(zFormat, ap));
436	436	va_end(ap);
437	437	}
	438	+
	439	+/*
	440	+** Add a "Content-disposition: attachment; filename=%s" header to the reply.
	441	+*/
	442	+void cgi_content_disposition_filename(const char *zFilename){
	443	+ char *z;
	444	+ int i, n;
	445	+
	446	+ /* 0123456789 123456789 123456789 123456789 123456*/
	447	+ z = mprintf("Content-Disposition: attachment; filename=\"%s\";\r\n",
	448	+ file_tail(zFilename));
	449	+ n = (int)strlen(z);
	450	+ for(i=43; i<n-4; i++){
	451	+ char c = z[i];
	452	+ if( fossil_isalnum(c) ) continue;
	453	+ if( c=='.' \|\| c=='-' \|\| c=='/' ) continue;
	454	+ z[i] = '_';
	455	+ }
	456	+ cgi_append_header(z);
	457	+ fossil_free(z);
	458	+}
438	459
439	460	/*
440	461	** Return the URL for the caller. This is obtained from either the
441	462	** referer CGI parameter, if it exists, or the HTTP_REFERER HTTP parameter.
442	463	** If neither exist, return zDefault.
443	464

	--- src/cgi.c
	+++ src/cgi.c
	@@ -433,10 +433,31 @@
433	va_list ap;
434	va_start(ap, zFormat);
435	cgi_redirect(vmprintf(zFormat, ap));
436	va_end(ap);
437	}





















438
439	/*
440	** Return the URL for the caller. This is obtained from either the
441	** referer CGI parameter, if it exists, or the HTTP_REFERER HTTP parameter.
442	** If neither exist, return zDefault.
443

	--- src/cgi.c
	+++ src/cgi.c
	@@ -433,10 +433,31 @@
433	va_list ap;
434	va_start(ap, zFormat);
435	cgi_redirect(vmprintf(zFormat, ap));
436	va_end(ap);
437	}
438
439	/*
440	** Add a "Content-disposition: attachment; filename=%s" header to the reply.
441	*/
442	void cgi_content_disposition_filename(const char *zFilename){
443	char *z;
444	int i, n;
445
446	/* 0123456789 123456789 123456789 123456789 123456*/
447	z = mprintf("Content-Disposition: attachment; filename=\"%s\";\r\n",
448	file_tail(zFilename));
449	n = (int)strlen(z);
450	for(i=43; i<n-4; i++){
451	char c = z[i];
452	if( fossil_isalnum(c) ) continue;
453	if( c=='.' \|\| c=='-' \|\| c=='/' ) continue;
454	z[i] = '_';
455	}
456	cgi_append_header(z);
457	fossil_free(z);
458	}
459
460	/*
461	** Return the URL for the caller. This is obtained from either the
462	** referer CGI parameter, if it exists, or the HTTP_REFERER HTTP parameter.
463	** If neither exist, return zDefault.
464

M src/db.c

+13 -1

		--- src/db.c
		+++ src/db.c
		@@ -2381,16 +2381,28 @@
2381	2381	char c = i==argc-1 ? '\n' : ' ';
2382	2382	fossil_print("%s%c", sqlite3_value_text(argv[i]), c);
2383	2383	}
2384	2384	}
2385	2385	}
2386		-LOCAL int db_sql_trace(unsigned m, void notUsed, void pP, void *pX){
	2386	+
	2387	+/*
	2388	+** Callback for sqlite3_trace_v2();
	2389	+*/
	2390	+int db_sql_trace(unsigned m, void notUsed, void pP, void *pX){
2387	2391	sqlite3_stmt pStmt = (sqlite3_stmt)pP;
2388	2392	char *zSql;
2389	2393	int n;
2390	2394	const char zArg = (const char)pX;
2391	2395	char zEnd[40];
	2396	+ if( m & SQLITE_TRACE_CLOSE ){
	2397	+ /* If we are tracking closes, that means we want to clean up static
	2398	+ ** prepared statements. */
	2399	+ while( db.pAllStmt ){
	2400	+ db_finalize(db.pAllStmt);
	2401	+ }
	2402	+ return 0;
	2403	+ }
2392	2404	if( zArg[0]=='-' ) return 0;
2393	2405	if( m & SQLITE_TRACE_PROFILE ){
2394	2406	sqlite3_int64 nNano = (sqlite3_int64)pX;
2395	2407	double rMillisec = 0.000001 * nNano;
2396	2408	sqlite3_snprintf(sizeof(zEnd),zEnd," /* %.3fms */\n", rMillisec);
2397	2409

	--- src/db.c
	+++ src/db.c
	@@ -2381,16 +2381,28 @@
2381	char c = i==argc-1 ? '\n' : ' ';
2382	fossil_print("%s%c", sqlite3_value_text(argv[i]), c);
2383	}
2384	}
2385	}
2386	LOCAL int db_sql_trace(unsigned m, void notUsed, void pP, void *pX){




2387	sqlite3_stmt pStmt = (sqlite3_stmt)pP;
2388	char *zSql;
2389	int n;
2390	const char zArg = (const char)pX;
2391	char zEnd[40];








2392	if( zArg[0]=='-' ) return 0;
2393	if( m & SQLITE_TRACE_PROFILE ){
2394	sqlite3_int64 nNano = (sqlite3_int64)pX;
2395	double rMillisec = 0.000001 * nNano;
2396	sqlite3_snprintf(sizeof(zEnd),zEnd," /* %.3fms */\n", rMillisec);
2397

	--- src/db.c
	+++ src/db.c
	@@ -2381,16 +2381,28 @@
2381	char c = i==argc-1 ? '\n' : ' ';
2382	fossil_print("%s%c", sqlite3_value_text(argv[i]), c);
2383	}
2384	}
2385	}
2386
2387	/*
2388	** Callback for sqlite3_trace_v2();
2389	*/
2390	int db_sql_trace(unsigned m, void notUsed, void pP, void *pX){
2391	sqlite3_stmt pStmt = (sqlite3_stmt)pP;
2392	char *zSql;
2393	int n;
2394	const char zArg = (const char)pX;
2395	char zEnd[40];
2396	if( m & SQLITE_TRACE_CLOSE ){
2397	/* If we are tracking closes, that means we want to clean up static
2398	** prepared statements. */
2399	while( db.pAllStmt ){
2400	db_finalize(db.pAllStmt);
2401	}
2402	return 0;
2403	}
2404	if( zArg[0]=='-' ) return 0;
2405	if( m & SQLITE_TRACE_PROFILE ){
2406	sqlite3_int64 nNano = (sqlite3_int64)pX;
2407	double rMillisec = 0.000001 * nNano;
2408	sqlite3_snprintf(sizeof(zEnd),zEnd," /* %.3fms */\n", rMillisec);
2409

M src/default_css.txt

		--- src/default_css.txt
		+++ src/default_css.txt
		@@ -860,5 +860,11 @@
860	860	// }
861	861	// #setup_skinedit_css_defaults > tbody > tr > td:nth-of-type(2) > div {
862	862	// max-width: 30em;
863	863	// overflow: auto;
864	864	// }
	865	+input {
	866	+ max-width: 95%;
	867	+}
	868	+textarea {
	869	+ max-width: 95%;
	870	+}
865	871

	--- src/default_css.txt
	+++ src/default_css.txt
	@@ -860,5 +860,11 @@
860	// }
861	// #setup_skinedit_css_defaults > tbody > tr > td:nth-of-type(2) > div {
862	// max-width: 30em;
863	// overflow: auto;
864	// }






865

	--- src/default_css.txt
	+++ src/default_css.txt
	@@ -860,5 +860,11 @@
860	// }
861	// #setup_skinedit_css_defaults > tbody > tr > td:nth-of-type(2) > div {
862	// max-width: 30em;
863	// overflow: auto;
864	// }
865	input {
866	max-width: 95%;
867	}
868	textarea {
869	max-width: 95%;
870	}
871

M src/doc.c

+18 -13

		--- src/doc.c
		+++ src/doc.c
		@@ -824,11 +824,12 @@
824	824	** regardless of what branch it occurs on.
825	825	**
826	826	** FILE is the name of a file to delivered up as a webpage. FILE is relative
827	827	** to the root of the source tree of the repository. The FILE must
828	828	** be a part of CHECKIN, except when CHECKIN=="ckout" when FILE is read
829		-** directly from disk and need not be a managed file.
	829	+** directly from disk and need not be a managed file. For /uv, FILE
	830	+** can also be the hash of the unversioned file.
830	831	**
831	832	** The "ckout" CHECKIN is intended for development - to provide a mechanism
832	833	** for looking at what a file will look like using the /doc webpage after
833	834	** it gets checked in.
834	835	**
		@@ -931,22 +932,26 @@
931	932	goto doc_not_found;
932	933	}
933	934	}
934	935	if( isUV ){
935	936	if( db_table_exists("repository","unversioned") ){
936		- Stmt q;
937		- db_prepare(&q, "SELECT hash, mtime FROM unversioned"
938		- " WHERE name=%Q", zName);
939		- if( db_step(&q)==SQLITE_ROW ){
940		- etag_check(ETAG_HASH, db_column_text(&q,0));
941		- etag_last_modified(db_column_int64(&q,1));
942		- }
943		- db_finalize(&q);
944		- if( unversioned_content(zName, &filebody)==0 ){
945		- rid = 1;
946		- zDfltTitle = zName;
947		- }
	937	+ rid = unversioned_content(zName, &filebody);
	938	+ if( rid==1 ){
	939	+ Stmt q;
	940	+ db_prepare(&q, "SELECT hash, mtime FROM unversioned"
	941	+ " WHERE name=%Q", zName);
	942	+ if( db_step(&q)==SQLITE_ROW ){
	943	+ etag_check(ETAG_HASH, db_column_text(&q,0));
	944	+ etag_last_modified(db_column_int64(&q,1));
	945	+ }
	946	+ db_finalize(&q);
	947	+ }else if( rid==2 ){
	948	+ zName = db_text(zName,
	949	+ "SELECT name FROM unversioned WHERE hash=%Q", zName);
	950	+ g.isConst = 1;
	951	+ }
	952	+ zDfltTitle = zName;
948	953	}
949	954	}else if( fossil_strcmp(zCheckin,"ckout")==0 ){
950	955	/* Read from the local checkout */
951	956	char *zFullpath;
952	957	db_must_be_within_tree();
953	958

	--- src/doc.c
	+++ src/doc.c
	@@ -824,11 +824,12 @@
824	** regardless of what branch it occurs on.
825	**
826	** FILE is the name of a file to delivered up as a webpage. FILE is relative
827	** to the root of the source tree of the repository. The FILE must
828	** be a part of CHECKIN, except when CHECKIN=="ckout" when FILE is read
829	** directly from disk and need not be a managed file.

830	**
831	** The "ckout" CHECKIN is intended for development - to provide a mechanism
832	** for looking at what a file will look like using the /doc webpage after
833	** it gets checked in.
834	**
	@@ -931,22 +932,26 @@
931	goto doc_not_found;
932	}
933	}
934	if( isUV ){
935	if( db_table_exists("repository","unversioned") ){
936	Stmt q;
937	db_prepare(&q, "SELECT hash, mtime FROM unversioned"
938	" WHERE name=%Q", zName);
939	if( db_step(&q)==SQLITE_ROW ){
940	etag_check(ETAG_HASH, db_column_text(&q,0));
941	etag_last_modified(db_column_int64(&q,1));
942	}
943	db_finalize(&q);
944	if( unversioned_content(zName, &filebody)==0 ){
945	rid = 1;
946	zDfltTitle = zName;
947	}




948	}
949	}else if( fossil_strcmp(zCheckin,"ckout")==0 ){
950	/* Read from the local checkout */
951	char *zFullpath;
952	db_must_be_within_tree();
953

	--- src/doc.c
	+++ src/doc.c
	@@ -824,11 +824,12 @@
824	** regardless of what branch it occurs on.
825	**
826	** FILE is the name of a file to delivered up as a webpage. FILE is relative
827	** to the root of the source tree of the repository. The FILE must
828	** be a part of CHECKIN, except when CHECKIN=="ckout" when FILE is read
829	** directly from disk and need not be a managed file. For /uv, FILE
830	** can also be the hash of the unversioned file.
831	**
832	** The "ckout" CHECKIN is intended for development - to provide a mechanism
833	** for looking at what a file will look like using the /doc webpage after
834	** it gets checked in.
835	**
	@@ -931,22 +932,26 @@
932	goto doc_not_found;
933	}
934	}
935	if( isUV ){
936	if( db_table_exists("repository","unversioned") ){
937	rid = unversioned_content(zName, &filebody);
938	if( rid==1 ){
939	Stmt q;
940	db_prepare(&q, "SELECT hash, mtime FROM unversioned"
941	" WHERE name=%Q", zName);
942	if( db_step(&q)==SQLITE_ROW ){
943	etag_check(ETAG_HASH, db_column_text(&q,0));
944	etag_last_modified(db_column_int64(&q,1));
945	}
946	db_finalize(&q);
947	}else if( rid==2 ){
948	zName = db_text(zName,
949	"SELECT name FROM unversioned WHERE hash=%Q", zName);
950	g.isConst = 1;
951	}
952	zDfltTitle = zName;
953	}
954	}else if( fossil_strcmp(zCheckin,"ckout")==0 ){
955	/* Read from the local checkout */
956	char *zFullpath;
957	db_must_be_within_tree();
958

M src/http_ssl.c

+14 -6

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -24,19 +24,19 @@
24	24	** SSL support is abstracted out into this module because Fossil can
25	25	** be compiled without SSL support (which requires OpenSSL library)
26	26	*/
27	27
28	28	#include "config.h"
	29	+#include "http_ssl.h"
29	30
30	31	#ifdef FOSSIL_ENABLE_SSL
31	32
32	33	#include <openssl/bio.h>
33	34	#include <openssl/ssl.h>
34	35	#include <openssl/err.h>
35	36	#include <openssl/x509.h>
36	37
37		-#include "http_ssl.h"
38	38	#include <assert.h>
39	39	#include <sys/types.h>
40	40
41	41	/*
42	42	** There can only be a single OpenSSL IO connection open at a time.
		@@ -328,10 +328,11 @@
328	328	ssl_close();
329	329	return 1;
330	330	}
331	331
332	332	if( !sslNoCertVerify && SSL_get_verify_result(ssl)!=X509_V_OK ){
	333	+ int x;
333	334	char desc, prompt;
334	335	Blob ans;
335	336	char cReply;
336	337	BIO *mem;
337	338	unsigned char md[32];
		@@ -338,11 +339,17 @@
338	339	char zHash[32*2+1];
339	340	unsigned int mdLength = (int)sizeof(md);
340	341
341	342	memset(md, 0, sizeof(md));
342	343	zHash[0] = 0;
343		- if( X509_digest(cert, EVP_sha256(), md, &mdLength) ){
	344	+ /* MMNNFFPPS */
	345	+#if OPENSSL_VERSION_NUMBER >= 0x010000000
	346	+ x = X509_digest(cert, EVP_sha256(), md, &mdLength);
	347	+#else
	348	+ x = X509_digest(cert, EVP_sha1(), md, &mdLength);
	349	+#endif
	350	+ if( x ){
344	351	int j;
345	352	for(j=0; j<mdLength && j*2+1<sizeof(zHash); ++j){
346	353	zHash[j*2] = "0123456789abcdef"[md[j]>>4];
347	354	zHash[j*2+1] = "0123456789abcdef"[md[j]&0xf];
348	355	}
		@@ -518,25 +525,26 @@
518	525	** for the domains listed. Or if
519	526	** the --all option is specified,
520	527	** remove all TLS cert exceptions.
521	528	*/
522	529	void test_tlsconfig_info(void){
523		- const char *zCmd;
524		- size_t nCmd;
525		- int nHit = 0;
526	530	#if !defined(FOSSIL_ENABLE_SSL)
527	531	fossil_print("TLS disabled in this build\n");
528	532	#else
	533	+ const char *zCmd;
	534	+ size_t nCmd;
	535	+ int nHit = 0;
529	536	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
530	537	db_open_config(1,0);
531	538	zCmd = g.argc>=3 ? g.argv[2] : "show";
532	539	nCmd = strlen(zCmd);
533	540	if( strncmp("show",zCmd,nCmd)==0 ){
534	541	const char zName, zValue;
535	542	size_t nName;
536	543	Stmt q;
537		- fossil_print("OpenSSL-version: %s\n", SSLeay_version(SSLEAY_VERSION));
	544	+ fossil_print("OpenSSL-version: %s (0x%09x)\n",
	545	+ SSLeay_version(SSLEAY_VERSION), OPENSSL_VERSION_NUMBER);
538	546	fossil_print("OpenSSL-cert-file: %s\n", X509_get_default_cert_file());
539	547	fossil_print("OpenSSL-cert-dir: %s\n", X509_get_default_cert_dir());
540	548	zName = X509_get_default_cert_file_env();
541	549	zValue = fossil_getenv(zName);
542	550	if( zValue==0 ) zValue = "";
543	551

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -24,19 +24,19 @@
24	** SSL support is abstracted out into this module because Fossil can
25	** be compiled without SSL support (which requires OpenSSL library)
26	*/
27
28	#include "config.h"

29
30	#ifdef FOSSIL_ENABLE_SSL
31
32	#include <openssl/bio.h>
33	#include <openssl/ssl.h>
34	#include <openssl/err.h>
35	#include <openssl/x509.h>
36
37	#include "http_ssl.h"
38	#include <assert.h>
39	#include <sys/types.h>
40
41	/*
42	** There can only be a single OpenSSL IO connection open at a time.
	@@ -328,10 +328,11 @@
328	ssl_close();
329	return 1;
330	}
331
332	if( !sslNoCertVerify && SSL_get_verify_result(ssl)!=X509_V_OK ){

333	char desc, prompt;
334	Blob ans;
335	char cReply;
336	BIO *mem;
337	unsigned char md[32];
	@@ -338,11 +339,17 @@
338	char zHash[32*2+1];
339	unsigned int mdLength = (int)sizeof(md);
340
341	memset(md, 0, sizeof(md));
342	zHash[0] = 0;
343	if( X509_digest(cert, EVP_sha256(), md, &mdLength) ){






344	int j;
345	for(j=0; j<mdLength && j*2+1<sizeof(zHash); ++j){
346	zHash[j*2] = "0123456789abcdef"[md[j]>>4];
347	zHash[j*2+1] = "0123456789abcdef"[md[j]&0xf];
348	}
	@@ -518,25 +525,26 @@
518	** for the domains listed. Or if
519	** the --all option is specified,
520	** remove all TLS cert exceptions.
521	*/
522	void test_tlsconfig_info(void){
523	const char *zCmd;
524	size_t nCmd;
525	int nHit = 0;
526	#if !defined(FOSSIL_ENABLE_SSL)
527	fossil_print("TLS disabled in this build\n");
528	#else



529	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
530	db_open_config(1,0);
531	zCmd = g.argc>=3 ? g.argv[2] : "show";
532	nCmd = strlen(zCmd);
533	if( strncmp("show",zCmd,nCmd)==0 ){
534	const char zName, zValue;
535	size_t nName;
536	Stmt q;
537	fossil_print("OpenSSL-version: %s\n", SSLeay_version(SSLEAY_VERSION));

538	fossil_print("OpenSSL-cert-file: %s\n", X509_get_default_cert_file());
539	fossil_print("OpenSSL-cert-dir: %s\n", X509_get_default_cert_dir());
540	zName = X509_get_default_cert_file_env();
541	zValue = fossil_getenv(zName);
542	if( zValue==0 ) zValue = "";
543

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -24,19 +24,19 @@
24	** SSL support is abstracted out into this module because Fossil can
25	** be compiled without SSL support (which requires OpenSSL library)
26	*/
27
28	#include "config.h"
29	#include "http_ssl.h"
30
31	#ifdef FOSSIL_ENABLE_SSL
32
33	#include <openssl/bio.h>
34	#include <openssl/ssl.h>
35	#include <openssl/err.h>
36	#include <openssl/x509.h>
37

38	#include <assert.h>
39	#include <sys/types.h>
40
41	/*
42	** There can only be a single OpenSSL IO connection open at a time.
	@@ -328,10 +328,11 @@
328	ssl_close();
329	return 1;
330	}
331
332	if( !sslNoCertVerify && SSL_get_verify_result(ssl)!=X509_V_OK ){
333	int x;
334	char desc, prompt;
335	Blob ans;
336	char cReply;
337	BIO *mem;
338	unsigned char md[32];
	@@ -338,11 +339,17 @@
339	char zHash[32*2+1];
340	unsigned int mdLength = (int)sizeof(md);
341
342	memset(md, 0, sizeof(md));
343	zHash[0] = 0;
344	/* MMNNFFPPS */
345	#if OPENSSL_VERSION_NUMBER >= 0x010000000
346	x = X509_digest(cert, EVP_sha256(), md, &mdLength);
347	#else
348	x = X509_digest(cert, EVP_sha1(), md, &mdLength);
349	#endif
350	if( x ){
351	int j;
352	for(j=0; j<mdLength && j*2+1<sizeof(zHash); ++j){
353	zHash[j*2] = "0123456789abcdef"[md[j]>>4];
354	zHash[j*2+1] = "0123456789abcdef"[md[j]&0xf];
355	}
	@@ -518,25 +525,26 @@
525	** for the domains listed. Or if
526	** the --all option is specified,
527	** remove all TLS cert exceptions.
528	*/
529	void test_tlsconfig_info(void){



530	#if !defined(FOSSIL_ENABLE_SSL)
531	fossil_print("TLS disabled in this build\n");
532	#else
533	const char *zCmd;
534	size_t nCmd;
535	int nHit = 0;
536	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
537	db_open_config(1,0);
538	zCmd = g.argc>=3 ? g.argv[2] : "show";
539	nCmd = strlen(zCmd);
540	if( strncmp("show",zCmd,nCmd)==0 ){
541	const char zName, zValue;
542	size_t nName;
543	Stmt q;
544	fossil_print("OpenSSL-version: %s (0x%09x)\n",
545	SSLeay_version(SSLEAY_VERSION), OPENSSL_VERSION_NUMBER);
546	fossil_print("OpenSSL-cert-file: %s\n", X509_get_default_cert_file());
547	fossil_print("OpenSSL-cert-dir: %s\n", X509_get_default_cert_dir());
548	zName = X509_get_default_cert_file_env();
549	zValue = fossil_getenv(zName);
550	if( zValue==0 ) zValue = "";
551

M src/info.c

+33 -17

		--- src/info.c
		+++ src/info.c
		@@ -1754,13 +1754,18 @@
1754	1754	style_footer();
1755	1755	}
1756	1756
1757	1757	/*
1758	1758	** WEBPAGE: raw
1759		-** URL: /raw?name=ARTIFACTID&m=TYPE
	1759	+** URL: /raw/ARTIFACTID
1760	1760	** URL: /raw?ci=BRANCH&filename=NAME
1761	1761	**
	1762	+** Additional query parameters:
	1763	+**
	1764	+** m=MIMETYPE The mimetype is MIMETYPE
	1765	+** at=FILENAME Content-disposition; attachment; filename=FILENAME;
	1766	+**
1762	1767	** Return the uninterpreted content of an artifact. Used primarily
1763	1768	** to view artifacts that are images.
1764	1769	*/
1765	1770	void rawartifact_page(void){
1766	1771	int rid = 0;
		@@ -1816,26 +1821,37 @@
1816	1821	** NULL, guess at the MIME-type based on the filename
1817	1822	** associated with the artifact.
1818	1823	*/
1819	1824	void deliver_artifact(int rid, const char *zMime){
1820	1825	Blob content;
	1826	+ const char *zAttachName = P("at");
1821	1827	if( zMime==0 ){
1822		- char *zFName = db_text(0, "SELECT filename.name FROM mlink, filename"
1823		- " WHERE mlink.fid=%d"
1824		- " AND filename.fnid=mlink.fnid", rid);
1825		- if( !zFName ){
	1828	+ char zFN = (char)zAttachName;
	1829	+ if( zFN==0 ){
	1830	+ zFN = db_text(0, "SELECT filename.name FROM mlink, filename"
	1831	+ " WHERE mlink.fid=%d"
	1832	+ " AND filename.fnid=mlink.fnid", rid);
	1833	+ }
	1834	+ if( zFN==0 ){
1826	1835	/* Look also at the attachment table */
1827		- zFName = db_text(0, "SELECT attachment.filename FROM attachment, blob"
1828		- " WHERE blob.rid=%d"
1829		- " AND attachment.src=blob.uuid", rid);
	1836	+ zFN = db_text(0, "SELECT attachment.filename FROM attachment, blob"
	1837	+ " WHERE blob.rid=%d"
	1838	+ " AND attachment.src=blob.uuid", rid);
	1839	+ }
	1840	+ if( zFN ){
	1841	+ zMime = mimetype_from_name(zFN);
1830	1842	}
1831		- if( zFName ) zMime = mimetype_from_name(zFName);
1832		- if( zMime==0 ) zMime = "application/x-fossil-artifact";
	1843	+ if( zMime==0 ){
	1844	+ zMime = "application/x-fossil-artifact";
	1845	+ }
1833	1846	}
1834	1847	content_get(rid, &content);
1835	1848	fossil_free(style_csp(1));
1836	1849	cgi_set_content_type(zMime);
	1850	+ if( zAttachName ){
	1851	+ cgi_content_disposition_filename(zAttachName);
	1852	+ }
1837	1853	cgi_set_content(&content);
1838	1854	}
1839	1855
1840	1856	/*
1841	1857	** Render a hex dump of a file.
		@@ -1929,12 +1945,12 @@
1929	1945	@ :</h2>
1930	1946	}
1931	1947	blob_zero(&downloadName);
1932	1948	if( P("verbose")!=0 ) objdescFlags \|= OBJDESC_DETAIL;
1933	1949	object_description(rid, objdescFlags, 0, &downloadName);
1934		- style_submenu_element("Download", "%s/raw/%T?name=%s",
1935		- g.zTop, blob_str(&downloadName), zUuid);
	1950	+ style_submenu_element("Download", "%R/raw/%s?at=%T",
	1951	+ zUuid, file_tail(blob_str(&downloadName)));
1936	1952	@ <hr />
1937	1953	content_get(rid, &content);
1938	1954	@ <blockquote><pre>
1939	1955	hexdump(&content);
1940	1956	@ </pre></blockquote>
		@@ -2259,12 +2275,13 @@
2259	2275	if( asText ) objdescFlags &= ~OBJDESC_BASE;
2260	2276	objType = object_description(rid, objdescFlags,
2261	2277	(isFile?zName:0), &downloadName);
2262	2278	}
2263	2279	if( !descOnly && P("download")!=0 ){
2264		- cgi_redirectf("%R/raw/%T?name=%s", blob_str(&downloadName),
2265		- db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid));
	2280	+ cgi_redirectf("%R/raw/%s?at=%T",
	2281	+ db_text("x", "SELECT uuid FROM blob WHERE rid=%d", rid),
	2282	+ file_tail(blob_str(&downloadName)));
2266	2283	/NOTREACHED/
2267	2284	}
2268	2285	if( g.perm.Admin ){
2269	2286	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
2270	2287	if( db_exists("SELECT 1 FROM shun WHERE uuid=%Q", zUuid) ){
		@@ -2305,12 +2322,11 @@
2305	2322	const char *zIp = db_column_text(&q,2);
2306	2323	@ <p>Received on %s(zDate) from %h(zUser) at %h(zIp).</p>
2307	2324	}
2308	2325	db_finalize(&q);
2309	2326	}
2310		- style_submenu_element("Download", "%R/raw/%T?name=%s",
2311		- blob_str(&downloadName), zUuid);
	2327	+ style_submenu_element("Download", "%R/raw/%s?at=%T", zUuid, file_tail(zName));
2312	2328	if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
2313	2329	style_submenu_element("Check-ins Using", "%R/timeline?n=200&uf=%s", zUuid);
2314	2330	}
2315	2331	zMime = mimetype_from_name(blob_str(&downloadName));
2316	2332	if( zMime ){
		@@ -2340,11 +2356,11 @@
2340	2356	@ <hr />
2341	2357	content_get(rid, &content);
2342	2358	if( renderAsWiki ){
2343	2359	wiki_render_by_mimetype(&content, zMime);
2344	2360	}else if( renderAsHtml ){
2345		- @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
	2361	+ @ <iframe src="%R/raw/%s(zUuid)"
2346	2362	@ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
2347	2363	@ sandbox="allow-same-origin" id="ifm1">
2348	2364	@ </iframe>
2349	2365	@ <script nonce="%h(style_nonce())">
2350	2366	@ document.getElementById("ifm1").addEventListener("load",
2351	2367

	--- src/info.c
	+++ src/info.c
	@@ -1754,13 +1754,18 @@
1754	style_footer();
1755	}
1756
1757	/*
1758	** WEBPAGE: raw
1759	** URL: /raw?name=ARTIFACTID&m=TYPE
1760	** URL: /raw?ci=BRANCH&filename=NAME
1761	**





1762	** Return the uninterpreted content of an artifact. Used primarily
1763	** to view artifacts that are images.
1764	*/
1765	void rawartifact_page(void){
1766	int rid = 0;
	@@ -1816,26 +1821,37 @@
1816	** NULL, guess at the MIME-type based on the filename
1817	** associated with the artifact.
1818	*/
1819	void deliver_artifact(int rid, const char *zMime){
1820	Blob content;

1821	if( zMime==0 ){
1822	char *zFName = db_text(0, "SELECT filename.name FROM mlink, filename"
1823	" WHERE mlink.fid=%d"
1824	" AND filename.fnid=mlink.fnid", rid);
1825	if( !zFName ){



1826	/* Look also at the attachment table */
1827	zFName = db_text(0, "SELECT attachment.filename FROM attachment, blob"
1828	" WHERE blob.rid=%d"
1829	" AND attachment.src=blob.uuid", rid);



1830	}
1831	if( zFName ) zMime = mimetype_from_name(zFName);
1832	if( zMime==0 ) zMime = "application/x-fossil-artifact";

1833	}
1834	content_get(rid, &content);
1835	fossil_free(style_csp(1));
1836	cgi_set_content_type(zMime);



1837	cgi_set_content(&content);
1838	}
1839
1840	/*
1841	** Render a hex dump of a file.
	@@ -1929,12 +1945,12 @@
1929	@ :</h2>
1930	}
1931	blob_zero(&downloadName);
1932	if( P("verbose")!=0 ) objdescFlags \|= OBJDESC_DETAIL;
1933	object_description(rid, objdescFlags, 0, &downloadName);
1934	style_submenu_element("Download", "%s/raw/%T?name=%s",
1935	g.zTop, blob_str(&downloadName), zUuid);
1936	@ <hr />
1937	content_get(rid, &content);
1938	@ <blockquote><pre>
1939	hexdump(&content);
1940	@ </pre></blockquote>
	@@ -2259,12 +2275,13 @@
2259	if( asText ) objdescFlags &= ~OBJDESC_BASE;
2260	objType = object_description(rid, objdescFlags,
2261	(isFile?zName:0), &downloadName);
2262	}
2263	if( !descOnly && P("download")!=0 ){
2264	cgi_redirectf("%R/raw/%T?name=%s", blob_str(&downloadName),
2265	db_text("?", "SELECT uuid FROM blob WHERE rid=%d", rid));

2266	/NOTREACHED/
2267	}
2268	if( g.perm.Admin ){
2269	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
2270	if( db_exists("SELECT 1 FROM shun WHERE uuid=%Q", zUuid) ){
	@@ -2305,12 +2322,11 @@
2305	const char *zIp = db_column_text(&q,2);
2306	@ <p>Received on %s(zDate) from %h(zUser) at %h(zIp).</p>
2307	}
2308	db_finalize(&q);
2309	}
2310	style_submenu_element("Download", "%R/raw/%T?name=%s",
2311	blob_str(&downloadName), zUuid);
2312	if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
2313	style_submenu_element("Check-ins Using", "%R/timeline?n=200&uf=%s", zUuid);
2314	}
2315	zMime = mimetype_from_name(blob_str(&downloadName));
2316	if( zMime ){
	@@ -2340,11 +2356,11 @@
2340	@ <hr />
2341	content_get(rid, &content);
2342	if( renderAsWiki ){
2343	wiki_render_by_mimetype(&content, zMime);
2344	}else if( renderAsHtml ){
2345	@ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
2346	@ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
2347	@ sandbox="allow-same-origin" id="ifm1">
2348	@ </iframe>
2349	@ <script nonce="%h(style_nonce())">
2350	@ document.getElementById("ifm1").addEventListener("load",
2351

	--- src/info.c
	+++ src/info.c
	@@ -1754,13 +1754,18 @@
1754	style_footer();
1755	}
1756
1757	/*
1758	** WEBPAGE: raw
1759	** URL: /raw/ARTIFACTID
1760	** URL: /raw?ci=BRANCH&filename=NAME
1761	**
1762	** Additional query parameters:
1763	**
1764	** m=MIMETYPE The mimetype is MIMETYPE
1765	** at=FILENAME Content-disposition; attachment; filename=FILENAME;
1766	**
1767	** Return the uninterpreted content of an artifact. Used primarily
1768	** to view artifacts that are images.
1769	*/
1770	void rawartifact_page(void){
1771	int rid = 0;
	@@ -1816,26 +1821,37 @@
1821	** NULL, guess at the MIME-type based on the filename
1822	** associated with the artifact.
1823	*/
1824	void deliver_artifact(int rid, const char *zMime){
1825	Blob content;
1826	const char *zAttachName = P("at");
1827	if( zMime==0 ){
1828	char zFN = (char)zAttachName;
1829	if( zFN==0 ){
1830	zFN = db_text(0, "SELECT filename.name FROM mlink, filename"
1831	" WHERE mlink.fid=%d"
1832	" AND filename.fnid=mlink.fnid", rid);
1833	}
1834	if( zFN==0 ){
1835	/* Look also at the attachment table */
1836	zFN = db_text(0, "SELECT attachment.filename FROM attachment, blob"
1837	" WHERE blob.rid=%d"
1838	" AND attachment.src=blob.uuid", rid);
1839	}
1840	if( zFN ){
1841	zMime = mimetype_from_name(zFN);
1842	}
1843	if( zMime==0 ){
1844	zMime = "application/x-fossil-artifact";
1845	}
1846	}
1847	content_get(rid, &content);
1848	fossil_free(style_csp(1));
1849	cgi_set_content_type(zMime);
1850	if( zAttachName ){
1851	cgi_content_disposition_filename(zAttachName);
1852	}
1853	cgi_set_content(&content);
1854	}
1855
1856	/*
1857	** Render a hex dump of a file.
	@@ -1929,12 +1945,12 @@
1945	@ :</h2>
1946	}
1947	blob_zero(&downloadName);
1948	if( P("verbose")!=0 ) objdescFlags \|= OBJDESC_DETAIL;
1949	object_description(rid, objdescFlags, 0, &downloadName);
1950	style_submenu_element("Download", "%R/raw/%s?at=%T",
1951	zUuid, file_tail(blob_str(&downloadName)));
1952	@ <hr />
1953	content_get(rid, &content);
1954	@ <blockquote><pre>
1955	hexdump(&content);
1956	@ </pre></blockquote>
	@@ -2259,12 +2275,13 @@
2275	if( asText ) objdescFlags &= ~OBJDESC_BASE;
2276	objType = object_description(rid, objdescFlags,
2277	(isFile?zName:0), &downloadName);
2278	}
2279	if( !descOnly && P("download")!=0 ){
2280	cgi_redirectf("%R/raw/%s?at=%T",
2281	db_text("x", "SELECT uuid FROM blob WHERE rid=%d", rid),
2282	file_tail(blob_str(&downloadName)));
2283	/NOTREACHED/
2284	}
2285	if( g.perm.Admin ){
2286	const char *zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid);
2287	if( db_exists("SELECT 1 FROM shun WHERE uuid=%Q", zUuid) ){
	@@ -2305,12 +2322,11 @@
2322	const char *zIp = db_column_text(&q,2);
2323	@ <p>Received on %s(zDate) from %h(zUser) at %h(zIp).</p>
2324	}
2325	db_finalize(&q);
2326	}
2327	style_submenu_element("Download", "%R/raw/%s?at=%T", zUuid, file_tail(zName));

2328	if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
2329	style_submenu_element("Check-ins Using", "%R/timeline?n=200&uf=%s", zUuid);
2330	}
2331	zMime = mimetype_from_name(blob_str(&downloadName));
2332	if( zMime ){
	@@ -2340,11 +2356,11 @@
2356	@ <hr />
2357	content_get(rid, &content);
2358	if( renderAsWiki ){
2359	wiki_render_by_mimetype(&content, zMime);
2360	}else if( renderAsHtml ){
2361	@ <iframe src="%R/raw/%s(zUuid)"
2362	@ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
2363	@ sandbox="allow-same-origin" id="ifm1">
2364	@ </iframe>
2365	@ <script nonce="%h(style_nonce())">
2366	@ document.getElementById("ifm1").addEventListener("load",
2367

M src/shell.c

+5 -2

		--- src/shell.c
		+++ src/shell.c
		@@ -6589,10 +6589,11 @@
6589	6589	** sqlar support.
6590	6590	*/
6591	6591	/* #include "sqlite3ext.h" */
6592	6592	SQLITE_EXTENSION_INIT1
6593	6593	#include <zlib.h>
	6594	+#include <assert.h>
6594	6595
6595	6596	/*
6596	6597	** Implementation of the "sqlar_compress(X)" SQL function.
6597	6598	**
6598	6599	** If the type of X is SQLITE_BLOB, and compressing that blob using
		@@ -8006,13 +8007,15 @@
8006	8007	if( !zDetail ) continue;
8007	8008	nDetail = STRLEN(zDetail);
8008	8009
8009	8010	for(i=0; i<nDetail; i++){
8010	8011	const char *zIdx = 0;
8011		- if( memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
	8012	+ if( i+13<nDetail && memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
8012	8013	zIdx = &zDetail[i+13];
8013		- }else if( memcmp(&zDetail[i], " USING COVERING INDEX ", 22)==0 ){
	8014	+ }else if( i+22<nDetail
	8015	+ && memcmp(&zDetail[i], " USING COVERING INDEX ", 22)==0
	8016	+ ){
8014	8017	zIdx = &zDetail[i+22];
8015	8018	}
8016	8019	if( zIdx ){
8017	8020	const char *zSql;
8018	8021	int nIdx = 0;
8019	8022

	--- src/shell.c
	+++ src/shell.c
	@@ -6589,10 +6589,11 @@
6589	** sqlar support.
6590	*/
6591	/* #include "sqlite3ext.h" */
6592	SQLITE_EXTENSION_INIT1
6593	#include <zlib.h>

6594
6595	/*
6596	** Implementation of the "sqlar_compress(X)" SQL function.
6597	**
6598	** If the type of X is SQLITE_BLOB, and compressing that blob using
	@@ -8006,13 +8007,15 @@
8006	if( !zDetail ) continue;
8007	nDetail = STRLEN(zDetail);
8008
8009	for(i=0; i<nDetail; i++){
8010	const char *zIdx = 0;
8011	if( memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
8012	zIdx = &zDetail[i+13];
8013	}else if( memcmp(&zDetail[i], " USING COVERING INDEX ", 22)==0 ){


8014	zIdx = &zDetail[i+22];
8015	}
8016	if( zIdx ){
8017	const char *zSql;
8018	int nIdx = 0;
8019

	--- src/shell.c
	+++ src/shell.c
	@@ -6589,10 +6589,11 @@
6589	** sqlar support.
6590	*/
6591	/* #include "sqlite3ext.h" */
6592	SQLITE_EXTENSION_INIT1
6593	#include <zlib.h>
6594	#include <assert.h>
6595
6596	/*
6597	** Implementation of the "sqlar_compress(X)" SQL function.
6598	**
6599	** If the type of X is SQLITE_BLOB, and compressing that blob using
	@@ -8006,13 +8007,15 @@
8007	if( !zDetail ) continue;
8008	nDetail = STRLEN(zDetail);
8009
8010	for(i=0; i<nDetail; i++){
8011	const char *zIdx = 0;
8012	if( i+13<nDetail && memcmp(&zDetail[i], " USING INDEX ", 13)==0 ){
8013	zIdx = &zDetail[i+13];
8014	}else if( i+22<nDetail
8015	&& memcmp(&zDetail[i], " USING COVERING INDEX ", 22)==0
8016	){
8017	zIdx = &zDetail[i+22];
8018	}
8019	if( zIdx ){
8020	const char *zSql;
8021	int nIdx = 0;
8022

M src/sqlcmd.c

		--- src/sqlcmd.c
		+++ src/sqlcmd.c
		@@ -164,10 +164,11 @@
164	164	static int sqlcmd_autoinit(
165	165	sqlite3 *db,
166	166	const char **pzErrMsg,
167	167	const void *notUsed
168	168	){
	169	+ int mTrace = SQLITE_TRACE_CLOSE;
169	170	add_content_sql_commands(db);
170	171	db_add_aux_functions(db);
171	172	re_add_sql_func(db);
172	173	search_sql_setup(db);
173	174	foci_register(db);
		@@ -186,10 +187,14 @@
186	187	char *zSql = sqlite3_mprintf("ATTACH %Q AS 'configdb' KEY ''",
187	188	g.zConfigDbName);
188	189	sqlite3_exec(db, zSql, 0, 0, 0);
189	190	sqlite3_free(zSql);
190	191	}
	192	+ /* Arrange to trace close operations so that static prepared statements
	193	+ ** will get cleaned up when the shell closes the database connection */
	194	+ if( g.fSqlTrace ) mTrace \|= SQLITE_TRACE_PROFILE;
	195	+ sqlite3_trace_v2(db, mTrace, db_sql_trace, 0);
191	196	return SQLITE_OK;
192	197	}
193	198
194	199	/*
195	200	** atexit() handler that cleans up global state modified by this module.
196	201

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -164,10 +164,11 @@
164	static int sqlcmd_autoinit(
165	sqlite3 *db,
166	const char **pzErrMsg,
167	const void *notUsed
168	){

169	add_content_sql_commands(db);
170	db_add_aux_functions(db);
171	re_add_sql_func(db);
172	search_sql_setup(db);
173	foci_register(db);
	@@ -186,10 +187,14 @@
186	char *zSql = sqlite3_mprintf("ATTACH %Q AS 'configdb' KEY ''",
187	g.zConfigDbName);
188	sqlite3_exec(db, zSql, 0, 0, 0);
189	sqlite3_free(zSql);
190	}




191	return SQLITE_OK;
192	}
193
194	/*
195	** atexit() handler that cleans up global state modified by this module.
196

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -164,10 +164,11 @@
164	static int sqlcmd_autoinit(
165	sqlite3 *db,
166	const char **pzErrMsg,
167	const void *notUsed
168	){
169	int mTrace = SQLITE_TRACE_CLOSE;
170	add_content_sql_commands(db);
171	db_add_aux_functions(db);
172	re_add_sql_func(db);
173	search_sql_setup(db);
174	foci_register(db);
	@@ -186,10 +187,14 @@
187	char *zSql = sqlite3_mprintf("ATTACH %Q AS 'configdb' KEY ''",
188	g.zConfigDbName);
189	sqlite3_exec(db, zSql, 0, 0, 0);
190	sqlite3_free(zSql);
191	}
192	/* Arrange to trace close operations so that static prepared statements
193	** will get cleaned up when the shell closes the database connection */
194	if( g.fSqlTrace ) mTrace \|= SQLITE_TRACE_PROFILE;
195	sqlite3_trace_v2(db, mTrace, db_sql_trace, 0);
196	return SQLITE_OK;
197	}
198
199	/*
200	** atexit() handler that cleans up global state modified by this module.
201

M src/sqlite3.c

+167 -85

		--- src/sqlite3.c
		+++ src/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.32.0. By combining all the individual C code files into this
	3	+** version 3.32.1. 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.
		@@ -1160,13 +1160,13 @@
1160	1160	**
1161	1161	** See also: [sqlite3_libversion()],
1162	1162	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163	1163	** [sqlite_version()] and [sqlite_source_id()].
1164	1164	*/
1165		-#define SQLITE_VERSION "3.32.0"
1166		-#define SQLITE_VERSION_NUMBER 3032000
1167		-#define SQLITE_SOURCE_ID "2020-05-17 13:47:28 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469f8ece"
	1165	+#define SQLITE_VERSION "3.32.1"
	1166	+#define SQLITE_VERSION_NUMBER 3032001
	1167	+#define SQLITE_SOURCE_ID "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
1168	1168
1169	1169	/*
1170	1170	** CAPI3REF: Run-Time Library Version Numbers
1171	1171	** KEYWORDS: sqlite3_version sqlite3_sourceid
1172	1172	**
		@@ -17841,11 +17841,11 @@
17841	17841	/*
17842	17842	** An instance of this structure contains information needed to generate
17843	17843	** code for a SELECT that contains aggregate functions.
17844	17844	**
17845	17845	** If Expr.op==TK_AGG_COLUMN or TK_AGG_FUNCTION then Expr.pAggInfo is a
17846		-** pointer to this structure. The Expr.iColumn field is the index in
	17846	+** pointer to this structure. The Expr.iAgg field is the index in
17847	17847	** AggInfo.aCol[] or AggInfo.aFunc[] of information needed to generate
17848	17848	** code for that node.
17849	17849	**
17850	17850	** AggInfo.pGroupBy and AggInfo.aFunc.pExpr point to fields within the
17851	17851	** original Select structure that describes the SELECT statement. These
		@@ -19080,10 +19080,13 @@
19080	19080	SQLITE_PRIVATE int sqlite3WalkSelectExpr(Walker, Select);
19081	19081	SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker, Select);
19082	19082	SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker, Expr);
19083	19083	SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker, Select);
19084	19084	SQLITE_PRIVATE int sqlite3SelectWalkFail(Walker, Select);
	19085	+SQLITE_PRIVATE int sqlite3WalkerDepthIncrease(Walker,Select);
	19086	+SQLITE_PRIVATE void sqlite3WalkerDepthDecrease(Walker,Select);
	19087	+
19085	19088	#ifdef SQLITE_DEBUG
19086	19089	SQLITE_PRIVATE void sqlite3SelectWalkAssert2(Walker, Select);
19087	19090	#endif
19088	19091
19089	19092	/*
		@@ -28274,10 +28277,17 @@
28274	28277	#ifndef SQLITE_PRINT_BUF_SIZE
28275	28278	# define SQLITE_PRINT_BUF_SIZE 70
28276	28279	#endif
28277	28280	#define etBUFSIZE SQLITE_PRINT_BUF_SIZE /* Size of the output buffer */
28278	28281
	28282	+/*
	28283	+** Hard limit on the precision of floating-point conversions.
	28284	+*/
	28285	+#ifndef SQLITE_PRINTF_PRECISION_LIMIT
	28286	+# define SQLITE_FP_PRECISION_LIMIT 100000000
	28287	+#endif
	28288	+
28279	28289	/*
28280	28290	** Render a string given by "fmt" into the StrAccum object.
28281	28291	*/
28282	28292	SQLITE_API void sqlite3_str_vappendf(
28283	28293	sqlite3_str pAccum, / Accumulate results here */
		@@ -28474,10 +28484,12 @@
28474	28484	** precision The specified precision. The default
28475	28485	** is -1.
28476	28486	** xtype The class of the conversion.
28477	28487	** infop Pointer to the appropriate info struct.
28478	28488	*/
	28489	+ assert( width>=0 );
	28490	+ assert( precision>=(-1) );
28479	28491	switch( xtype ){
28480	28492	case etPOINTER:
28481	28493	flag_long = sizeof(char*)==sizeof(i64) ? 2 :
28482	28494	sizeof(char*)==sizeof(long int) ? 1 : 0;
28483	28495	/* Fall through into the next case */
		@@ -28595,10 +28607,15 @@
28595	28607	}
28596	28608	#ifdef SQLITE_OMIT_FLOATING_POINT
28597	28609	length = 0;
28598	28610	#else
28599	28611	if( precision<0 ) precision = 6; /* Set default precision */
	28612	+#ifdef SQLITE_FP_PRECISION_LIMIT
	28613	+ if( precision>SQLITE_FP_PRECISION_LIMIT ){
	28614	+ precision = SQLITE_FP_PRECISION_LIMIT;
	28615	+ }
	28616	+#endif
28600	28617	if( realvalue<0.0 ){
28601	28618	realvalue = -realvalue;
28602	28619	prefix = '-';
28603	28620	}else{
28604	28621	prefix = flag_prefix;
		@@ -28877,11 +28894,11 @@
28877	28894	}else{
28878	28895	escarg = va_arg(ap,char*);
28879	28896	}
28880	28897	isnull = escarg==0;
28881	28898	if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
28882		- /* For %q, %Q, and %w, the precision is the number of byte (or
	28899	+ /* For %q, %Q, and %w, the precision is the number of bytes (or
28883	28900	** characters if the ! flags is present) to use from the input.
28884	28901	** Because of the extra quoting characters inserted, the number
28885	28902	** of output characters may be larger than the precision.
28886	28903	*/
28887	28904	k = precision;
		@@ -29962,12 +29979,13 @@
29962	29979	#else
29963	29980	pWin = 0;
29964	29981	#endif
29965	29982	}
29966	29983	if( pExpr->op==TK_AGG_FUNCTION ){
29967		- sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s",
29968		- pExpr->op2, pExpr->u.zToken, zFlgs);
	29984	+ sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s iAgg=%d agg=%p",
	29985	+ pExpr->op2, pExpr->u.zToken, zFlgs,
	29986	+ pExpr->iAgg, pExpr->pAggInfo);
29969	29987	}else if( pExpr->op2!=0 ){
29970	29988	const char *zOp2;
29971	29989	char zBuf[8];
29972	29990	sqlite3_snprintf(sizeof(zBuf),zBuf,"0x%02x",pExpr->op2);
29973	29991	zOp2 = zBuf;
		@@ -30856,10 +30874,11 @@
30856	30874	/* UTF-16 Little-endian -> UTF-8 */
30857	30875	while( zIn<zTerm ){
30858	30876	c = *(zIn++);
30859	30877	c += (*(zIn++))<<8;
30860	30878	if( c>=0xd800 && c<0xe000 ){
	30879	+#ifdef SQLITE_REPLACE_INVALID_UTF
30861	30880	if( c>=0xdc00 \|\| zIn>=zTerm ){
30862	30881	c = 0xfffd;
30863	30882	}else{
30864	30883	int c2 = *(zIn++);
30865	30884	c2 += (*(zIn++))<<8;
		@@ -30868,19 +30887,27 @@
30868	30887	c = 0xfffd;
30869	30888	}else{
30870	30889	c = ((c&0x3ff)<<10) + (c2&0x3ff) + 0x10000;
30871	30890	}
30872	30891	}
	30892	+#else
	30893	+ if( zIn<zTerm ){
	30894	+ int c2 = (*zIn++);
	30895	+ c2 += ((*zIn++)<<8);
	30896	+ c = (c2&0x03FF) + ((c&0x003F)<<10) + (((c&0x03C0)+0x0040)<<10);
	30897	+ }
	30898	+#endif
30873	30899	}
30874	30900	WRITE_UTF8(z, c);
30875	30901	}
30876	30902	}else{
30877	30903	/* UTF-16 Big-endian -> UTF-8 */
30878	30904	while( zIn<zTerm ){
30879	30905	c = (*(zIn++))<<8;
30880	30906	c += *(zIn++);
30881	30907	if( c>=0xd800 && c<0xe000 ){
	30908	+#ifdef SQLITE_REPLACE_INVALID_UTF
30882	30909	if( c>=0xdc00 \|\| zIn>=zTerm ){
30883	30910	c = 0xfffd;
30884	30911	}else{
30885	30912	int c2 = (*(zIn++))<<8;
30886	30913	c2 += *(zIn++);
		@@ -30889,10 +30916,17 @@
30889	30916	c = 0xfffd;
30890	30917	}else{
30891	30918	c = ((c&0x3ff)<<10) + (c2&0x3ff) + 0x10000;
30892	30919	}
30893	30920	}
	30921	+#else
	30922	+ if( zIn<zTerm ){
	30923	+ int c2 = ((*zIn++)<<8);
	30924	+ c2 += (*zIn++);
	30925	+ c = (c2&0x03FF) + ((c&0x003F)<<10) + (((c&0x03C0)+0x0040)<<10);
	30926	+ }
	30927	+#endif
30894	30928	}
30895	30929	WRITE_UTF8(z, c);
30896	30930	}
30897	30931	}
30898	30932	pMem->n = (int)(z - zOut);
		@@ -46821,11 +46855,13 @@
46821	46855	pFile->pVfs = pVfs;
46822	46856	pFile->h = h;
46823	46857	if( isReadonly ){
46824	46858	pFile->ctrlFlags \|= WINFILE_RDONLY;
46825	46859	}
46826		- if( sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE) ){
	46860	+ if( (flags & SQLITE_OPEN_MAIN_DB)
	46861	+ && sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE)
	46862	+ ){
46827	46863	pFile->ctrlFlags \|= WINFILE_PSOW;
46828	46864	}
46829	46865	pFile->lastErrno = NO_ERROR;
46830	46866	pFile->zPath = zName;
46831	46867	#if SQLITE_MAX_MMAP_SIZE>0
		@@ -48313,14 +48349,15 @@
48313	48349	*/
48314	48350	SQLITE_PRIVATE int sqlite3MemdbInit(void){
48315	48351	sqlite3_vfs *pLower = sqlite3_vfs_find(0);
48316	48352	int sz = pLower->szOsFile;
48317	48353	memdb_vfs.pAppData = pLower;
48318		- /* In all known configurations of SQLite, the size of a default
48319		- ** sqlite3_file is greater than the size of a memdb sqlite3_file.
48320		- ** Should that ever change, remove the following NEVER() */
48321		- if( NEVER(sz<sizeof(MemFile)) ) sz = sizeof(MemFile);
	48354	+ /* The following conditional can only be true when compiled for
	48355	+ ** Windows x86 and SQLITE_MAX_MMAP_SIZE=0. We always leave
	48356	+ ** it in, to be safe, but it is marked as NO_TEST since there
	48357	+ ** is no way to reach it under most builds. */
	48358	+ if( sz<sizeof(MemFile) ) sz = sizeof(MemFile); /NO_TEST/
48322	48359	memdb_vfs.szOsFile = sz;
48323	48360	return sqlite3_vfs_register(&memdb_vfs, 0);
48324	48361	}
48325	48362	#endif /* SQLITE_ENABLE_DESERIALIZE */
48326	48363
		@@ -59957,29 +59994,47 @@
59957	59994
59958	59995	aOut[0] = s1;
59959	59996	aOut[1] = s2;
59960	59997	}
59961	59998
	59999	+/*
	60000	+** If there is the possibility of concurrent access to the SHM file
	60001	+** from multiple threads and/or processes, then do a memory barrier.
	60002	+*/
59962	60003	static void walShmBarrier(Wal *pWal){
59963	60004	if( pWal->exclusiveMode!=WAL_HEAPMEMORY_MODE ){
59964	60005	sqlite3OsShmBarrier(pWal->pDbFd);
59965	60006	}
59966	60007	}
59967	60008
	60009	+/*
	60010	+** Add the SQLITE_NO_TSAN as part of the return-type of a function
	60011	+** definition as a hint that the function contains constructs that
	60012	+** might give false-positive TSAN warnings.
	60013	+**
	60014	+** See tag-20200519-1.
	60015	+*/
	60016	+#if defined(__clang__) && !defined(SQLITE_NO_TSAN)
	60017	+# define SQLITE_NO_TSAN __attribute__((no_sanitize_thread))
	60018	+#else
	60019	+# define SQLITE_NO_TSAN
	60020	+#endif
	60021	+
59968	60022	/*
59969	60023	** Write the header information in pWal->hdr into the wal-index.
59970	60024	**
59971	60025	** The checksum on pWal->hdr is updated before it is written.
59972	60026	*/
59973		-static void walIndexWriteHdr(Wal *pWal){
	60027	+static SQLITE_NO_TSAN void walIndexWriteHdr(Wal *pWal){
59974	60028	volatile WalIndexHdr *aHdr = walIndexHdr(pWal);
59975	60029	const int nCksum = offsetof(WalIndexHdr, aCksum);
59976	60030
59977	60031	assert( pWal->writeLock );
59978	60032	pWal->hdr.isInit = 1;
59979	60033	pWal->hdr.iVersion = WALINDEX_MAX_VERSION;
59980	60034	walChecksumBytes(1, (u8*)&pWal->hdr, nCksum, 0, pWal->hdr.aCksum);
	60035	+ /* Possible TSAN false-positive. See tag-20200519-1 */
59981	60036	memcpy((void)&aHdr[1], (const void)&pWal->hdr, sizeof(WalIndexHdr));
59982	60037	walShmBarrier(pWal);
59983	60038	memcpy((void)&aHdr[0], (const void)&pWal->hdr, sizeof(WalIndexHdr));
59984	60039	}
59985	60040
		@@ -61165,36 +61220,17 @@
61165	61220	** cannot be backfilled from the WAL.
61166	61221	*/
61167	61222	mxSafeFrame = pWal->hdr.mxFrame;
61168	61223	mxPage = pWal->hdr.nPage;
61169	61224	for(i=1; i<WAL_NREADER; i++){
61170		- /* Thread-sanitizer reports that the following is an unsafe read,
61171		- ** as some other thread may be in the process of updating the value
61172		- ** of the aReadMark[] slot. The assumption here is that if that is
61173		- ** happening, the other client may only be increasing the value,
61174		- ** not decreasing it. So assuming either that either the "old" or
61175		- ** "new" version of the value is read, and not some arbitrary value
61176		- ** that would never be written by a real client, things are still
61177		- ** safe.
61178		- **
61179		- ** Astute readers have pointed out that the assumption stated in the
61180		- ** last sentence of the previous paragraph is not guaranteed to be
61181		- ** true for all conforming systems. However, the assumption is true
61182		- ** for all compilers and architectures in common use today (circa
61183		- ** 2019-11-27) and the alternatives are both slow and complex, and
61184		- ** so we will continue to go with the current design for now. If this
61185		- ** bothers you, or if you really are running on a system where aligned
61186		- ** 32-bit reads and writes are not atomic, then you can simply avoid
61187		- ** the use of WAL mode, or only use WAL mode together with
61188		- ** PRAGMA locking_mode=EXCLUSIVE and all will be well.
61189		- */
61190		- u32 y = pInfo->aReadMark[i];
	61225	+ u32 y = AtomicLoad(pInfo->aReadMark+i);
61191	61226	if( mxSafeFrame>y ){
61192	61227	assert( y<=pWal->hdr.mxFrame );
61193	61228	rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(i), 1);
61194	61229	if( rc==SQLITE_OK ){
61195		- pInfo->aReadMark[i] = (i==1 ? mxSafeFrame : READMARK_NOT_USED);
	61230	+ u32 iMark = (i==1 ? mxSafeFrame : READMARK_NOT_USED);
	61231	+ AtomicStore(pInfo->aReadMark+i, iMark);
61196	61232	walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
61197	61233	}else if( rc==SQLITE_BUSY ){
61198	61234	mxSafeFrame = y;
61199	61235	xBusy = 0;
61200	61236	}else{
		@@ -61208,11 +61244,11 @@
61208	61244	rc = walIteratorInit(pWal, pInfo->nBackfill, &pIter);
61209	61245	assert( rc==SQLITE_OK \|\| pIter==0 );
61210	61246	}
61211	61247
61212	61248	if( pIter
61213		- && (rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(0),1))==SQLITE_OK
	61249	+ && (rc = walBusyLock(pWal,xBusy,pBusyArg,WAL_READ_LOCK(0),1))==SQLITE_OK
61214	61250	){
61215	61251	u32 nBackfill = pInfo->nBackfill;
61216	61252
61217	61253	pInfo->nBackfillAttempted = mxSafeFrame;
61218	61254
		@@ -61423,11 +61459,11 @@
61423	61459	** and *pChanged is set to 1.
61424	61460	**
61425	61461	** If the checksum cannot be verified return non-zero. If the header
61426	61462	** is read successfully and the checksum verified, return zero.
61427	61463	*/
61428		-static int walIndexTryHdr(Wal pWal, int pChanged){
	61464	+static SQLITE_NO_TSAN int walIndexTryHdr(Wal pWal, int pChanged){
61429	61465	u32 aCksum[2]; /* Checksum on the header content */
61430	61466	WalIndexHdr h1, h2; /* Two copies of the header content */
61431	61467	WalIndexHdr volatile aHdr; / Header in shared memory */
61432	61468
61433	61469	/* The first page of the wal-index must be mapped at this point. */
		@@ -61436,17 +61472,23 @@
61436	61472	/* Read the header. This might happen concurrently with a write to the
61437	61473	** same area of shared memory on a different CPU in a SMP,
61438	61474	** meaning it is possible that an inconsistent snapshot is read
61439	61475	** from the file. If this happens, return non-zero.
61440	61476	**
	61477	+ ** tag-20200519-1:
61441	61478	** There are two copies of the header at the beginning of the wal-index.
61442	61479	** When reading, read [0] first then [1]. Writes are in the reverse order.
61443	61480	** Memory barriers are used to prevent the compiler or the hardware from
61444		- ** reordering the reads and writes.
	61481	+ ** reordering the reads and writes. TSAN and similar tools can sometimes
	61482	+ ** give false-positive warnings about these accesses because the tools do not
	61483	+ ** account for the double-read and the memory barrier. The use of mutexes
	61484	+ ** here would be problematic as the memory being accessed is potentially
	61485	+ ** shared among multiple processes and not all mutex implementions work
	61486	+ ** reliably in that environment.
61445	61487	*/
61446	61488	aHdr = walIndexHdr(pWal);
61447		- memcpy(&h1, (void *)&aHdr[0], sizeof(h1));
	61489	+ memcpy(&h1, (void )&aHdr[0], sizeof(h1)); / Possible TSAN false-positive */
61448	61490	walShmBarrier(pWal);
61449	61491	memcpy(&h2, (void *)&aHdr[1], sizeof(h2));
61450	61492
61451	61493	if( memcmp(&h1, &h2, sizeof(h1))!=0 ){
61452	61494	return 1; /* Dirty read */
		@@ -62109,16 +62151,18 @@
62109	62151	** needs to be flushed.
62110	62152	*/
62111	62153	SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal pWal, int pChanged){
62112	62154	int rc; /* Return code */
62113	62155	int cnt = 0; /* Number of TryBeginRead attempts */
	62156	+#ifdef SQLITE_ENABLE_SNAPSHOT
	62157	+ int bChanged = 0;
	62158	+ WalIndexHdr *pSnapshot = pWal->pSnapshot;
	62159	+#endif
62114	62160
62115	62161	assert( pWal->ckptLock==0 );
62116	62162
62117	62163	#ifdef SQLITE_ENABLE_SNAPSHOT
62118		- int bChanged = 0;
62119		- WalIndexHdr *pSnapshot = pWal->pSnapshot;
62120	62164	if( pSnapshot ){
62121	62165	if( memcmp(pSnapshot, &pWal->hdr, sizeof(WalIndexHdr))!=0 ){
62122	62166	bChanged = 1;
62123	62167	}
62124	62168
		@@ -62283,26 +62327,28 @@
62283	62327	for(iHash=walFramePage(iLast); iHash>=iMinHash; iHash--){
62284	62328	WalHashLoc sLoc; /* Hash table location */
62285	62329	int iKey; /* Hash slot index */
62286	62330	int nCollide; /* Number of hash collisions remaining */
62287	62331	int rc; /* Error code */
	62332	+ u32 iH;
62288	62333
62289	62334	rc = walHashGet(pWal, iHash, &sLoc);
62290	62335	if( rc!=SQLITE_OK ){
62291	62336	return rc;
62292	62337	}
62293	62338	nCollide = HASHTABLE_NSLOT;
62294		- for(iKey=walHash(pgno); sLoc.aHash[iKey]; iKey=walNextHash(iKey)){
62295		- u32 iH = sLoc.aHash[iKey];
	62339	+ iKey = walHash(pgno);
	62340	+ while( (iH = AtomicLoad(&sLoc.aHash[iKey]))!=0 ){
62296	62341	u32 iFrame = iH + sLoc.iZero;
62297	62342	if( iFrame<=iLast && iFrame>=pWal->minFrame && sLoc.aPgno[iH]==pgno ){
62298	62343	assert( iFrame>iRead \|\| CORRUPT_DB );
62299	62344	iRead = iFrame;
62300	62345	}
62301	62346	if( (nCollide--)==0 ){
62302	62347	return SQLITE_CORRUPT_BKPT;
62303	62348	}
	62349	+ iKey = walNextHash(iKey);
62304	62350	}
62305	62351	if( iRead ) break;
62306	62352	}
62307	62353
62308	62354	#ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT
		@@ -97436,10 +97482,47 @@
97436	97482	}
97437	97483	p = p->pPrior;
97438	97484	}while( p!=0 );
97439	97485	return WRC_Continue;
97440	97486	}
	97487	+
	97488	+/* Increase the walkerDepth when entering a subquery, and
	97489	+** descrease when leaving the subquery.
	97490	+*/
	97491	+SQLITE_PRIVATE int sqlite3WalkerDepthIncrease(Walker pWalker, Select pSelect){
	97492	+ UNUSED_PARAMETER(pSelect);
	97493	+ pWalker->walkerDepth++;
	97494	+ return WRC_Continue;
	97495	+}
	97496	+SQLITE_PRIVATE void sqlite3WalkerDepthDecrease(Walker pWalker, Select pSelect){
	97497	+ UNUSED_PARAMETER(pSelect);
	97498	+ pWalker->walkerDepth--;
	97499	+}
	97500	+
	97501	+
	97502	+/*
	97503	+** No-op routine for the parse-tree walker.
	97504	+**
	97505	+** When this routine is the Walker.xExprCallback then expression trees
	97506	+** are walked without any actions being taken at each node. Presumably,
	97507	+** when this routine is used for Walker.xExprCallback then
	97508	+** Walker.xSelectCallback is set to do something useful for every
	97509	+** subquery in the parser tree.
	97510	+*/
	97511	+SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker NotUsed, Expr NotUsed2){
	97512	+ UNUSED_PARAMETER2(NotUsed, NotUsed2);
	97513	+ return WRC_Continue;
	97514	+}
	97515	+
	97516	+/*
	97517	+** No-op routine for the parse-tree walker for SELECT statements.
	97518	+** subquery in the parser tree.
	97519	+*/
	97520	+SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker NotUsed, Select NotUsed2){
	97521	+ UNUSED_PARAMETER2(NotUsed, NotUsed2);
	97522	+ return WRC_Continue;
	97523	+}
97441	97524
97442	97525	/************ End of walker.c ********************************************/
97443	97526	/************ Begin file resolve.c ***************************************/
97444	97527	/*
97445	97528	** 2008 August 18
		@@ -97465,10 +97548,12 @@
97465	97548	** This needs to occur when copying a TK_AGG_FUNCTION node from an
97466	97549	** outer query into an inner subquery.
97467	97550	**
97468	97551	** incrAggFunctionDepth(pExpr,n) is the main routine. incrAggDepth(..)
97469	97552	** is a helper function - a callback for the tree walker.
	97553	+**
	97554	+** See also the sqlite3WindowExtraAggFuncDepth() routine in window.c
97470	97555	*/
97471	97556	static int incrAggDepth(Walker pWalker, Expr pExpr){
97472	97557	if( pExpr->op==TK_AGG_FUNCTION ) pExpr->op2 += pWalker->u.n;
97473	97558	return WRC_Continue;
97474	97559	}
		@@ -103206,11 +103291,14 @@
103206	103291	op = pExpr->op;
103207	103292	}
103208	103293	switch( op ){
103209	103294	case TK_AGG_COLUMN: {
103210	103295	AggInfo *pAggInfo = pExpr->pAggInfo;
103211		- struct AggInfo_col *pCol = &pAggInfo->aCol[pExpr->iAgg];
	103296	+ struct AggInfo_col *pCol;
	103297	+ assert( pAggInfo!=0 );
	103298	+ assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
	103299	+ pCol = &pAggInfo->aCol[pExpr->iAgg];
103212	103300	if( !pAggInfo->directMode ){
103213	103301	assert( pCol->iMem>0 );
103214	103302	return pCol->iMem;
103215	103303	}else if( pAggInfo->useSortingIdx ){
103216	103304	Table *pTab = pCol->pTab;
		@@ -103506,11 +103594,14 @@
103506	103594	sqlite3VdbeJumpHere(v, addr);
103507	103595	break;
103508	103596	}
103509	103597	case TK_AGG_FUNCTION: {
103510	103598	AggInfo *pInfo = pExpr->pAggInfo;
103511		- if( pInfo==0 ){
	103599	+ if( pInfo==0
	103600	+ \|\| NEVER(pExpr->iAgg<0)
	103601	+ \|\| NEVER(pExpr->iAgg>=pInfo->nFunc)
	103602	+ ){
103512	103603	assert( !ExprHasProperty(pExpr, EP_IntValue) );
103513	103604	sqlite3ErrorMsg(pParse, "misuse of aggregate: %s()", pExpr->u.zToken);
103514	103605	}else{
103515	103606	return pInfo->aFunc[pExpr->iAgg].iMem;
103516	103607	}
		@@ -105262,19 +105353,10 @@
105262	105353	}
105263	105354	}
105264	105355	}
105265	105356	return WRC_Continue;
105266	105357	}
105267		-static int analyzeAggregatesInSelect(Walker pWalker, Select pSelect){
105268		- UNUSED_PARAMETER(pSelect);
105269		- pWalker->walkerDepth++;
105270		- return WRC_Continue;
105271		-}
105272		-static void analyzeAggregatesInSelectEnd(Walker pWalker, Select pSelect){
105273		- UNUSED_PARAMETER(pSelect);
105274		- pWalker->walkerDepth--;
105275		-}
105276	105358
105277	105359	/*
105278	105360	** Analyze the pExpr expression looking for aggregate functions and
105279	105361	** for variables that need to be added to AggInfo object that pNC->pAggInfo
105280	105362	** points to. Additional entries are made on the AggInfo object as
		@@ -105284,12 +105366,12 @@
105284	105366	** analyzed by sqlite3ResolveExprNames().
105285	105367	*/
105286	105368	SQLITE_PRIVATE void sqlite3ExprAnalyzeAggregates(NameContext pNC, Expr pExpr){
105287	105369	Walker w;
105288	105370	w.xExprCallback = analyzeAggregate;
105289		- w.xSelectCallback = analyzeAggregatesInSelect;
105290		- w.xSelectCallback2 = analyzeAggregatesInSelectEnd;
	105371	+ w.xSelectCallback = sqlite3WalkerDepthIncrease;
	105372	+ w.xSelectCallback2 = sqlite3WalkerDepthDecrease;
105291	105373	w.walkerDepth = 0;
105292	105374	w.u.pNC = pNC;
105293	105375	w.pParse = 0;
105294	105376	assert( pNC->pSrcList!=0 );
105295	105377	sqlite3WalkExpr(&w, pExpr);
		@@ -122007,11 +122089,11 @@
122007	122089	}
122008	122090	if( bAffinityDone==0 && (pUpIdx==0 \|\| pUpIdx==pIdx) ){
122009	122091	sqlite3TableAffinity(v, pTab, regNewData+1);
122010	122092	bAffinityDone = 1;
122011	122093	}
122012		- VdbeNoopComment((v, "uniqueness check for %s", pIdx->zName));
	122094	+ VdbeNoopComment((v, "prep index %s", pIdx->zName));
122013	122095	iThisCur = iIdxCur+ix;
122014	122096
122015	122097
122016	122098	/* Skip partial indices for which the WHERE clause is not true */
122017	122099	if( pIdx->pPartIdxWhere ){
		@@ -133979,33 +134061,10 @@
133979	134061	}
133980	134062	}
133981	134063	return WRC_Continue;
133982	134064	}
133983	134065
133984		-/*
133985		-** No-op routine for the parse-tree walker.
133986		-**
133987		-** When this routine is the Walker.xExprCallback then expression trees
133988		-** are walked without any actions being taken at each node. Presumably,
133989		-** when this routine is used for Walker.xExprCallback then
133990		-** Walker.xSelectCallback is set to do something useful for every
133991		-** subquery in the parser tree.
133992		-*/
133993		-SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker NotUsed, Expr NotUsed2){
133994		- UNUSED_PARAMETER2(NotUsed, NotUsed2);
133995		- return WRC_Continue;
133996		-}
133997		-
133998		-/*
133999		-** No-op routine for the parse-tree walker for SELECT statements.
134000		-** subquery in the parser tree.
134001		-*/
134002		-SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker NotUsed, Select NotUsed2){
134003		- UNUSED_PARAMETER2(NotUsed, NotUsed2);
134004		- return WRC_Continue;
134005		-}
134006		-
134007	134066	#if SQLITE_DEBUG
134008	134067	/*
134009	134068	** Always assert. This xSelectCallback2 implementation proves that the
134010	134069	** xSelectCallback2 is never invoked.
134011	134070	*/
		@@ -135172,11 +135231,11 @@
135172	135231	sAggInfo.mxReg = pParse->nMem;
135173	135232	if( db->mallocFailed ) goto select_end;
135174	135233	#if SELECTTRACE_ENABLED
135175	135234	if( sqlite3SelectTrace & 0x400 ){
135176	135235	int ii;
135177		- SELECTTRACE(0x400,pParse,p,("After aggregate analysis:\n"));
	135236	+ SELECTTRACE(0x400,pParse,p,("After aggregate analysis %p:\n", &sAggInfo));
135178	135237	sqlite3TreeViewSelect(0, p, 0);
135179	135238	for(ii=0; ii<sAggInfo.nColumn; ii++){
135180	135239	sqlite3DebugPrintf("agg-column[%d] iMem=%d\n",
135181	135240	ii, sAggInfo.aCol[ii].iMem);
135182	135241	sqlite3TreeViewExpr(0, sAggInfo.aCol[ii].pExpr, 0);
		@@ -151215,10 +151274,27 @@
151215	151274	if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags;
151216	151275	}
151217	151276	}
151218	151277	return pList;
151219	151278	}
	151279	+
	151280	+/*
	151281	+** When rewriting a query, if the new subquery in the FROM clause
	151282	+** contains TK_AGG_FUNCTION nodes that refer to an outer query,
	151283	+** then we have to increase the Expr->op2 values of those nodes
	151284	+** due to the extra subquery layer that was added.
	151285	+**
	151286	+** See also the incrAggDepth() routine in resolve.c
	151287	+*/
	151288	+static int sqlite3WindowExtraAggFuncDepth(Walker pWalker, Expr pExpr){
	151289	+ if( pExpr->op==TK_AGG_FUNCTION
	151290	+ && pExpr->op2>=pWalker->walkerDepth
	151291	+ ){
	151292	+ pExpr->op2++;
	151293	+ }
	151294	+ return WRC_Continue;
	151295	+}
151220	151296
151221	151297	/*
151222	151298	** If the SELECT statement passed as the second argument does not invoke
151223	151299	** any SQL window functions, this function is a no-op. Otherwise, it
151224	151300	** rewrites the SELECT statement so that window function xStep functions
		@@ -151325,10 +151401,11 @@
151325	151401	pParse, pSublist, pSrc, pWhere, pGroupBy, pHaving, pSort, 0, 0
151326	151402	);
151327	151403	p->pSrc = sqlite3SrcListAppend(pParse, 0, 0, 0);
151328	151404	if( p->pSrc ){
151329	151405	Table *pTab2;
	151406	+ Walker w;
151330	151407	p->pSrc->a[0].pSelect = pSub;
151331	151408	sqlite3SrcListAssignCursors(pParse, p->pSrc);
151332	151409	pSub->selFlags \|= SF_Expanded;
151333	151410	pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, SQLITE_AFF_NONE);
151334	151411	pSub->selFlags \|= (selFlags & SF_Aggregate);
		@@ -151340,10 +151417,15 @@
151340	151417	}else{
151341	151418	memcpy(pTab, pTab2, sizeof(Table));
151342	151419	pTab->tabFlags \|= TF_Ephemeral;
151343	151420	p->pSrc->a[0].pTab = pTab;
151344	151421	pTab = pTab2;
	151422	+ memset(&w, 0, sizeof(w));
	151423	+ w.xExprCallback = sqlite3WindowExtraAggFuncDepth;
	151424	+ w.xSelectCallback = sqlite3WalkerDepthIncrease;
	151425	+ w.xSelectCallback2 = sqlite3WalkerDepthDecrease;
	151426	+ sqlite3WalkSelect(&w, pSub);
151345	151427	}
151346	151428	}else{
151347	151429	sqlite3SelectDelete(db, pSub);
151348	151430	}
151349	151431	if( db->mallocFailed ) rc = SQLITE_NOMEM;
		@@ -224738,11 +224820,11 @@
224738	224820	int nArg, /* Number of args */
224739	224821	sqlite3_value *apUnused / Function arguments */
224740	224822	){
224741	224823	assert( nArg==0 );
224742	224824	UNUSED_PARAM2(nArg, apUnused);
224743		- sqlite3_result_text(pCtx, "fts5: 2020-05-17 00:26:44 1313557b512297e7b75ed748894379b2022aecf696d5a58318e46a668321c1ff", -1, SQLITE_TRANSIENT);
	224825	+ sqlite3_result_text(pCtx, "fts5: 2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350", -1, SQLITE_TRANSIENT);
224744	224826	}
224745	224827
224746	224828	/*
224747	224829	** Return true if zName is the extension on one of the shadow tables used
224748	224830	** by this module.
		@@ -229521,12 +229603,12 @@
229521	229603	}
229522	229604	#endif /* SQLITE_CORE */
229523	229605	#endif /* !defined(SQLITE_CORE) \|\| defined(SQLITE_ENABLE_STMTVTAB) */
229524	229606
229525	229607	/************ End of stmt.c **********************************************/
229526		-#if __LINE__!=229526
	229608	+#if __LINE__!=229608
229527	229609	#undef SQLITE_SOURCE_ID
229528		-#define SQLITE_SOURCE_ID "2020-05-17 13:47:28 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469falt2"
	229610	+#define SQLITE_SOURCE_ID "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba8alt2"
229529	229611	#endif
229530	229612	/* Return the source-id for this library */
229531	229613	SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
229532	229614	/************************ End of sqlite3.c ****************************/
229533	229615

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.32.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.
	@@ -1160,13 +1160,13 @@
1160	**
1161	** See also: [sqlite3_libversion()],
1162	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163	** [sqlite_version()] and [sqlite_source_id()].
1164	*/
1165	#define SQLITE_VERSION "3.32.0"
1166	#define SQLITE_VERSION_NUMBER 3032000
1167	#define SQLITE_SOURCE_ID "2020-05-17 13:47:28 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469f8ece"
1168
1169	/*
1170	** CAPI3REF: Run-Time Library Version Numbers
1171	** KEYWORDS: sqlite3_version sqlite3_sourceid
1172	**
	@@ -17841,11 +17841,11 @@
17841	/*
17842	** An instance of this structure contains information needed to generate
17843	** code for a SELECT that contains aggregate functions.
17844	**
17845	** If Expr.op==TK_AGG_COLUMN or TK_AGG_FUNCTION then Expr.pAggInfo is a
17846	** pointer to this structure. The Expr.iColumn field is the index in
17847	** AggInfo.aCol[] or AggInfo.aFunc[] of information needed to generate
17848	** code for that node.
17849	**
17850	** AggInfo.pGroupBy and AggInfo.aFunc.pExpr point to fields within the
17851	** original Select structure that describes the SELECT statement. These
	@@ -19080,10 +19080,13 @@
19080	SQLITE_PRIVATE int sqlite3WalkSelectExpr(Walker, Select);
19081	SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker, Select);
19082	SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker, Expr);
19083	SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker, Select);
19084	SQLITE_PRIVATE int sqlite3SelectWalkFail(Walker, Select);



19085	#ifdef SQLITE_DEBUG
19086	SQLITE_PRIVATE void sqlite3SelectWalkAssert2(Walker, Select);
19087	#endif
19088
19089	/*
	@@ -28274,10 +28277,17 @@
28274	#ifndef SQLITE_PRINT_BUF_SIZE
28275	# define SQLITE_PRINT_BUF_SIZE 70
28276	#endif
28277	#define etBUFSIZE SQLITE_PRINT_BUF_SIZE /* Size of the output buffer */
28278







28279	/*
28280	** Render a string given by "fmt" into the StrAccum object.
28281	*/
28282	SQLITE_API void sqlite3_str_vappendf(
28283	sqlite3_str pAccum, / Accumulate results here */
	@@ -28474,10 +28484,12 @@
28474	** precision The specified precision. The default
28475	** is -1.
28476	** xtype The class of the conversion.
28477	** infop Pointer to the appropriate info struct.
28478	*/


28479	switch( xtype ){
28480	case etPOINTER:
28481	flag_long = sizeof(char*)==sizeof(i64) ? 2 :
28482	sizeof(char*)==sizeof(long int) ? 1 : 0;
28483	/* Fall through into the next case */
	@@ -28595,10 +28607,15 @@
28595	}
28596	#ifdef SQLITE_OMIT_FLOATING_POINT
28597	length = 0;
28598	#else
28599	if( precision<0 ) precision = 6; /* Set default precision */





28600	if( realvalue<0.0 ){
28601	realvalue = -realvalue;
28602	prefix = '-';
28603	}else{
28604	prefix = flag_prefix;
	@@ -28877,11 +28894,11 @@
28877	}else{
28878	escarg = va_arg(ap,char*);
28879	}
28880	isnull = escarg==0;
28881	if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
28882	/* For %q, %Q, and %w, the precision is the number of byte (or
28883	** characters if the ! flags is present) to use from the input.
28884	** Because of the extra quoting characters inserted, the number
28885	** of output characters may be larger than the precision.
28886	*/
28887	k = precision;
	@@ -29962,12 +29979,13 @@
29962	#else
29963	pWin = 0;
29964	#endif
29965	}
29966	if( pExpr->op==TK_AGG_FUNCTION ){
29967	sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s",
29968	pExpr->op2, pExpr->u.zToken, zFlgs);

29969	}else if( pExpr->op2!=0 ){
29970	const char *zOp2;
29971	char zBuf[8];
29972	sqlite3_snprintf(sizeof(zBuf),zBuf,"0x%02x",pExpr->op2);
29973	zOp2 = zBuf;
	@@ -30856,10 +30874,11 @@
30856	/* UTF-16 Little-endian -> UTF-8 */
30857	while( zIn<zTerm ){
30858	c = *(zIn++);
30859	c += (*(zIn++))<<8;
30860	if( c>=0xd800 && c<0xe000 ){

30861	if( c>=0xdc00 \|\| zIn>=zTerm ){
30862	c = 0xfffd;
30863	}else{
30864	int c2 = *(zIn++);
30865	c2 += (*(zIn++))<<8;
	@@ -30868,19 +30887,27 @@
30868	c = 0xfffd;
30869	}else{
30870	c = ((c&0x3ff)<<10) + (c2&0x3ff) + 0x10000;
30871	}
30872	}







30873	}
30874	WRITE_UTF8(z, c);
30875	}
30876	}else{
30877	/* UTF-16 Big-endian -> UTF-8 */
30878	while( zIn<zTerm ){
30879	c = (*(zIn++))<<8;
30880	c += *(zIn++);
30881	if( c>=0xd800 && c<0xe000 ){

30882	if( c>=0xdc00 \|\| zIn>=zTerm ){
30883	c = 0xfffd;
30884	}else{
30885	int c2 = (*(zIn++))<<8;
30886	c2 += *(zIn++);
	@@ -30889,10 +30916,17 @@
30889	c = 0xfffd;
30890	}else{
30891	c = ((c&0x3ff)<<10) + (c2&0x3ff) + 0x10000;
30892	}
30893	}







30894	}
30895	WRITE_UTF8(z, c);
30896	}
30897	}
30898	pMem->n = (int)(z - zOut);
	@@ -46821,11 +46855,13 @@
46821	pFile->pVfs = pVfs;
46822	pFile->h = h;
46823	if( isReadonly ){
46824	pFile->ctrlFlags \|= WINFILE_RDONLY;
46825	}
46826	if( sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE) ){


46827	pFile->ctrlFlags \|= WINFILE_PSOW;
46828	}
46829	pFile->lastErrno = NO_ERROR;
46830	pFile->zPath = zName;
46831	#if SQLITE_MAX_MMAP_SIZE>0
	@@ -48313,14 +48349,15 @@
48313	*/
48314	SQLITE_PRIVATE int sqlite3MemdbInit(void){
48315	sqlite3_vfs *pLower = sqlite3_vfs_find(0);
48316	int sz = pLower->szOsFile;
48317	memdb_vfs.pAppData = pLower;
48318	/* In all known configurations of SQLite, the size of a default
48319	** sqlite3_file is greater than the size of a memdb sqlite3_file.
48320	** Should that ever change, remove the following NEVER() */
48321	if( NEVER(sz<sizeof(MemFile)) ) sz = sizeof(MemFile);

48322	memdb_vfs.szOsFile = sz;
48323	return sqlite3_vfs_register(&memdb_vfs, 0);
48324	}
48325	#endif /* SQLITE_ENABLE_DESERIALIZE */
48326
	@@ -59957,29 +59994,47 @@
59957
59958	aOut[0] = s1;
59959	aOut[1] = s2;
59960	}
59961




59962	static void walShmBarrier(Wal *pWal){
59963	if( pWal->exclusiveMode!=WAL_HEAPMEMORY_MODE ){
59964	sqlite3OsShmBarrier(pWal->pDbFd);
59965	}
59966	}
59967













59968	/*
59969	** Write the header information in pWal->hdr into the wal-index.
59970	**
59971	** The checksum on pWal->hdr is updated before it is written.
59972	*/
59973	static void walIndexWriteHdr(Wal *pWal){
59974	volatile WalIndexHdr *aHdr = walIndexHdr(pWal);
59975	const int nCksum = offsetof(WalIndexHdr, aCksum);
59976
59977	assert( pWal->writeLock );
59978	pWal->hdr.isInit = 1;
59979	pWal->hdr.iVersion = WALINDEX_MAX_VERSION;
59980	walChecksumBytes(1, (u8*)&pWal->hdr, nCksum, 0, pWal->hdr.aCksum);

59981	memcpy((void)&aHdr[1], (const void)&pWal->hdr, sizeof(WalIndexHdr));
59982	walShmBarrier(pWal);
59983	memcpy((void)&aHdr[0], (const void)&pWal->hdr, sizeof(WalIndexHdr));
59984	}
59985
	@@ -61165,36 +61220,17 @@
61165	** cannot be backfilled from the WAL.
61166	*/
61167	mxSafeFrame = pWal->hdr.mxFrame;
61168	mxPage = pWal->hdr.nPage;
61169	for(i=1; i<WAL_NREADER; i++){
61170	/* Thread-sanitizer reports that the following is an unsafe read,
61171	** as some other thread may be in the process of updating the value
61172	** of the aReadMark[] slot. The assumption here is that if that is
61173	** happening, the other client may only be increasing the value,
61174	** not decreasing it. So assuming either that either the "old" or
61175	** "new" version of the value is read, and not some arbitrary value
61176	** that would never be written by a real client, things are still
61177	** safe.
61178	**
61179	** Astute readers have pointed out that the assumption stated in the
61180	** last sentence of the previous paragraph is not guaranteed to be
61181	** true for all conforming systems. However, the assumption is true
61182	** for all compilers and architectures in common use today (circa
61183	** 2019-11-27) and the alternatives are both slow and complex, and
61184	** so we will continue to go with the current design for now. If this
61185	** bothers you, or if you really are running on a system where aligned
61186	** 32-bit reads and writes are not atomic, then you can simply avoid
61187	** the use of WAL mode, or only use WAL mode together with
61188	** PRAGMA locking_mode=EXCLUSIVE and all will be well.
61189	*/
61190	u32 y = pInfo->aReadMark[i];
61191	if( mxSafeFrame>y ){
61192	assert( y<=pWal->hdr.mxFrame );
61193	rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(i), 1);
61194	if( rc==SQLITE_OK ){
61195	pInfo->aReadMark[i] = (i==1 ? mxSafeFrame : READMARK_NOT_USED);

61196	walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
61197	}else if( rc==SQLITE_BUSY ){
61198	mxSafeFrame = y;
61199	xBusy = 0;
61200	}else{
	@@ -61208,11 +61244,11 @@
61208	rc = walIteratorInit(pWal, pInfo->nBackfill, &pIter);
61209	assert( rc==SQLITE_OK \|\| pIter==0 );
61210	}
61211
61212	if( pIter
61213	&& (rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(0),1))==SQLITE_OK
61214	){
61215	u32 nBackfill = pInfo->nBackfill;
61216
61217	pInfo->nBackfillAttempted = mxSafeFrame;
61218
	@@ -61423,11 +61459,11 @@
61423	** and *pChanged is set to 1.
61424	**
61425	** If the checksum cannot be verified return non-zero. If the header
61426	** is read successfully and the checksum verified, return zero.
61427	*/
61428	static int walIndexTryHdr(Wal pWal, int pChanged){
61429	u32 aCksum[2]; /* Checksum on the header content */
61430	WalIndexHdr h1, h2; /* Two copies of the header content */
61431	WalIndexHdr volatile aHdr; / Header in shared memory */
61432
61433	/* The first page of the wal-index must be mapped at this point. */
	@@ -61436,17 +61472,23 @@
61436	/* Read the header. This might happen concurrently with a write to the
61437	** same area of shared memory on a different CPU in a SMP,
61438	** meaning it is possible that an inconsistent snapshot is read
61439	** from the file. If this happens, return non-zero.
61440	**

61441	** There are two copies of the header at the beginning of the wal-index.
61442	** When reading, read [0] first then [1]. Writes are in the reverse order.
61443	** Memory barriers are used to prevent the compiler or the hardware from
61444	** reordering the reads and writes.





61445	*/
61446	aHdr = walIndexHdr(pWal);
61447	memcpy(&h1, (void *)&aHdr[0], sizeof(h1));
61448	walShmBarrier(pWal);
61449	memcpy(&h2, (void *)&aHdr[1], sizeof(h2));
61450
61451	if( memcmp(&h1, &h2, sizeof(h1))!=0 ){
61452	return 1; /* Dirty read */
	@@ -62109,16 +62151,18 @@
62109	** needs to be flushed.
62110	*/
62111	SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal pWal, int pChanged){
62112	int rc; /* Return code */
62113	int cnt = 0; /* Number of TryBeginRead attempts */




62114
62115	assert( pWal->ckptLock==0 );
62116
62117	#ifdef SQLITE_ENABLE_SNAPSHOT
62118	int bChanged = 0;
62119	WalIndexHdr *pSnapshot = pWal->pSnapshot;
62120	if( pSnapshot ){
62121	if( memcmp(pSnapshot, &pWal->hdr, sizeof(WalIndexHdr))!=0 ){
62122	bChanged = 1;
62123	}
62124
	@@ -62283,26 +62327,28 @@
62283	for(iHash=walFramePage(iLast); iHash>=iMinHash; iHash--){
62284	WalHashLoc sLoc; /* Hash table location */
62285	int iKey; /* Hash slot index */
62286	int nCollide; /* Number of hash collisions remaining */
62287	int rc; /* Error code */

62288
62289	rc = walHashGet(pWal, iHash, &sLoc);
62290	if( rc!=SQLITE_OK ){
62291	return rc;
62292	}
62293	nCollide = HASHTABLE_NSLOT;
62294	for(iKey=walHash(pgno); sLoc.aHash[iKey]; iKey=walNextHash(iKey)){
62295	u32 iH = sLoc.aHash[iKey];
62296	u32 iFrame = iH + sLoc.iZero;
62297	if( iFrame<=iLast && iFrame>=pWal->minFrame && sLoc.aPgno[iH]==pgno ){
62298	assert( iFrame>iRead \|\| CORRUPT_DB );
62299	iRead = iFrame;
62300	}
62301	if( (nCollide--)==0 ){
62302	return SQLITE_CORRUPT_BKPT;
62303	}

62304	}
62305	if( iRead ) break;
62306	}
62307
62308	#ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT
	@@ -97436,10 +97482,47 @@
97436	}
97437	p = p->pPrior;
97438	}while( p!=0 );
97439	return WRC_Continue;
97440	}





































97441
97442	/************ End of walker.c ********************************************/
97443	/************ Begin file resolve.c ***************************************/
97444	/*
97445	** 2008 August 18
	@@ -97465,10 +97548,12 @@
97465	** This needs to occur when copying a TK_AGG_FUNCTION node from an
97466	** outer query into an inner subquery.
97467	**
97468	** incrAggFunctionDepth(pExpr,n) is the main routine. incrAggDepth(..)
97469	** is a helper function - a callback for the tree walker.


97470	*/
97471	static int incrAggDepth(Walker pWalker, Expr pExpr){
97472	if( pExpr->op==TK_AGG_FUNCTION ) pExpr->op2 += pWalker->u.n;
97473	return WRC_Continue;
97474	}
	@@ -103206,11 +103291,14 @@
103206	op = pExpr->op;
103207	}
103208	switch( op ){
103209	case TK_AGG_COLUMN: {
103210	AggInfo *pAggInfo = pExpr->pAggInfo;
103211	struct AggInfo_col *pCol = &pAggInfo->aCol[pExpr->iAgg];



103212	if( !pAggInfo->directMode ){
103213	assert( pCol->iMem>0 );
103214	return pCol->iMem;
103215	}else if( pAggInfo->useSortingIdx ){
103216	Table *pTab = pCol->pTab;
	@@ -103506,11 +103594,14 @@
103506	sqlite3VdbeJumpHere(v, addr);
103507	break;
103508	}
103509	case TK_AGG_FUNCTION: {
103510	AggInfo *pInfo = pExpr->pAggInfo;
103511	if( pInfo==0 ){



103512	assert( !ExprHasProperty(pExpr, EP_IntValue) );
103513	sqlite3ErrorMsg(pParse, "misuse of aggregate: %s()", pExpr->u.zToken);
103514	}else{
103515	return pInfo->aFunc[pExpr->iAgg].iMem;
103516	}
	@@ -105262,19 +105353,10 @@
105262	}
105263	}
105264	}
105265	return WRC_Continue;
105266	}
105267	static int analyzeAggregatesInSelect(Walker pWalker, Select pSelect){
105268	UNUSED_PARAMETER(pSelect);
105269	pWalker->walkerDepth++;
105270	return WRC_Continue;
105271	}
105272	static void analyzeAggregatesInSelectEnd(Walker pWalker, Select pSelect){
105273	UNUSED_PARAMETER(pSelect);
105274	pWalker->walkerDepth--;
105275	}
105276
105277	/*
105278	** Analyze the pExpr expression looking for aggregate functions and
105279	** for variables that need to be added to AggInfo object that pNC->pAggInfo
105280	** points to. Additional entries are made on the AggInfo object as
	@@ -105284,12 +105366,12 @@
105284	** analyzed by sqlite3ResolveExprNames().
105285	*/
105286	SQLITE_PRIVATE void sqlite3ExprAnalyzeAggregates(NameContext pNC, Expr pExpr){
105287	Walker w;
105288	w.xExprCallback = analyzeAggregate;
105289	w.xSelectCallback = analyzeAggregatesInSelect;
105290	w.xSelectCallback2 = analyzeAggregatesInSelectEnd;
105291	w.walkerDepth = 0;
105292	w.u.pNC = pNC;
105293	w.pParse = 0;
105294	assert( pNC->pSrcList!=0 );
105295	sqlite3WalkExpr(&w, pExpr);
	@@ -122007,11 +122089,11 @@
122007	}
122008	if( bAffinityDone==0 && (pUpIdx==0 \|\| pUpIdx==pIdx) ){
122009	sqlite3TableAffinity(v, pTab, regNewData+1);
122010	bAffinityDone = 1;
122011	}
122012	VdbeNoopComment((v, "uniqueness check for %s", pIdx->zName));
122013	iThisCur = iIdxCur+ix;
122014
122015
122016	/* Skip partial indices for which the WHERE clause is not true */
122017	if( pIdx->pPartIdxWhere ){
	@@ -133979,33 +134061,10 @@
133979	}
133980	}
133981	return WRC_Continue;
133982	}
133983
133984	/*
133985	** No-op routine for the parse-tree walker.
133986	**
133987	** When this routine is the Walker.xExprCallback then expression trees
133988	** are walked without any actions being taken at each node. Presumably,
133989	** when this routine is used for Walker.xExprCallback then
133990	** Walker.xSelectCallback is set to do something useful for every
133991	** subquery in the parser tree.
133992	*/
133993	SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker NotUsed, Expr NotUsed2){
133994	UNUSED_PARAMETER2(NotUsed, NotUsed2);
133995	return WRC_Continue;
133996	}
133997
133998	/*
133999	** No-op routine for the parse-tree walker for SELECT statements.
134000	** subquery in the parser tree.
134001	*/
134002	SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker NotUsed, Select NotUsed2){
134003	UNUSED_PARAMETER2(NotUsed, NotUsed2);
134004	return WRC_Continue;
134005	}
134006
134007	#if SQLITE_DEBUG
134008	/*
134009	** Always assert. This xSelectCallback2 implementation proves that the
134010	** xSelectCallback2 is never invoked.
134011	*/
	@@ -135172,11 +135231,11 @@
135172	sAggInfo.mxReg = pParse->nMem;
135173	if( db->mallocFailed ) goto select_end;
135174	#if SELECTTRACE_ENABLED
135175	if( sqlite3SelectTrace & 0x400 ){
135176	int ii;
135177	SELECTTRACE(0x400,pParse,p,("After aggregate analysis:\n"));
135178	sqlite3TreeViewSelect(0, p, 0);
135179	for(ii=0; ii<sAggInfo.nColumn; ii++){
135180	sqlite3DebugPrintf("agg-column[%d] iMem=%d\n",
135181	ii, sAggInfo.aCol[ii].iMem);
135182	sqlite3TreeViewExpr(0, sAggInfo.aCol[ii].pExpr, 0);
	@@ -151215,10 +151274,27 @@
151215	if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags;
151216	}
151217	}
151218	return pList;
151219	}

















151220
151221	/*
151222	** If the SELECT statement passed as the second argument does not invoke
151223	** any SQL window functions, this function is a no-op. Otherwise, it
151224	** rewrites the SELECT statement so that window function xStep functions
	@@ -151325,10 +151401,11 @@
151325	pParse, pSublist, pSrc, pWhere, pGroupBy, pHaving, pSort, 0, 0
151326	);
151327	p->pSrc = sqlite3SrcListAppend(pParse, 0, 0, 0);
151328	if( p->pSrc ){
151329	Table *pTab2;

151330	p->pSrc->a[0].pSelect = pSub;
151331	sqlite3SrcListAssignCursors(pParse, p->pSrc);
151332	pSub->selFlags \|= SF_Expanded;
151333	pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, SQLITE_AFF_NONE);
151334	pSub->selFlags \|= (selFlags & SF_Aggregate);
	@@ -151340,10 +151417,15 @@
151340	}else{
151341	memcpy(pTab, pTab2, sizeof(Table));
151342	pTab->tabFlags \|= TF_Ephemeral;
151343	p->pSrc->a[0].pTab = pTab;
151344	pTab = pTab2;





151345	}
151346	}else{
151347	sqlite3SelectDelete(db, pSub);
151348	}
151349	if( db->mallocFailed ) rc = SQLITE_NOMEM;
	@@ -224738,11 +224820,11 @@
224738	int nArg, /* Number of args */
224739	sqlite3_value *apUnused / Function arguments */
224740	){
224741	assert( nArg==0 );
224742	UNUSED_PARAM2(nArg, apUnused);
224743	sqlite3_result_text(pCtx, "fts5: 2020-05-17 00:26:44 1313557b512297e7b75ed748894379b2022aecf696d5a58318e46a668321c1ff", -1, SQLITE_TRANSIENT);
224744	}
224745
224746	/*
224747	** Return true if zName is the extension on one of the shadow tables used
224748	** by this module.
	@@ -229521,12 +229603,12 @@
229521	}
229522	#endif /* SQLITE_CORE */
229523	#endif /* !defined(SQLITE_CORE) \|\| defined(SQLITE_ENABLE_STMTVTAB) */
229524
229525	/************ End of stmt.c **********************************************/
229526	#if __LINE__!=229526
229527	#undef SQLITE_SOURCE_ID
229528	#define SQLITE_SOURCE_ID "2020-05-17 13:47:28 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469falt2"
229529	#endif
229530	/* Return the source-id for this library */
229531	SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
229532	/************************ End of sqlite3.c ****************************/
229533

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.32.1. 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.
	@@ -1160,13 +1160,13 @@
1160	**
1161	** See also: [sqlite3_libversion()],
1162	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163	** [sqlite_version()] and [sqlite_source_id()].
1164	*/
1165	#define SQLITE_VERSION "3.32.1"
1166	#define SQLITE_VERSION_NUMBER 3032001
1167	#define SQLITE_SOURCE_ID "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
1168
1169	/*
1170	** CAPI3REF: Run-Time Library Version Numbers
1171	** KEYWORDS: sqlite3_version sqlite3_sourceid
1172	**
	@@ -17841,11 +17841,11 @@
17841	/*
17842	** An instance of this structure contains information needed to generate
17843	** code for a SELECT that contains aggregate functions.
17844	**
17845	** If Expr.op==TK_AGG_COLUMN or TK_AGG_FUNCTION then Expr.pAggInfo is a
17846	** pointer to this structure. The Expr.iAgg field is the index in
17847	** AggInfo.aCol[] or AggInfo.aFunc[] of information needed to generate
17848	** code for that node.
17849	**
17850	** AggInfo.pGroupBy and AggInfo.aFunc.pExpr point to fields within the
17851	** original Select structure that describes the SELECT statement. These
	@@ -19080,10 +19080,13 @@
19080	SQLITE_PRIVATE int sqlite3WalkSelectExpr(Walker, Select);
19081	SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker, Select);
19082	SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker, Expr);
19083	SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker, Select);
19084	SQLITE_PRIVATE int sqlite3SelectWalkFail(Walker, Select);
19085	SQLITE_PRIVATE int sqlite3WalkerDepthIncrease(Walker,Select);
19086	SQLITE_PRIVATE void sqlite3WalkerDepthDecrease(Walker,Select);
19087
19088	#ifdef SQLITE_DEBUG
19089	SQLITE_PRIVATE void sqlite3SelectWalkAssert2(Walker, Select);
19090	#endif
19091
19092	/*
	@@ -28274,10 +28277,17 @@
28277	#ifndef SQLITE_PRINT_BUF_SIZE
28278	# define SQLITE_PRINT_BUF_SIZE 70
28279	#endif
28280	#define etBUFSIZE SQLITE_PRINT_BUF_SIZE /* Size of the output buffer */
28281
28282	/*
28283	** Hard limit on the precision of floating-point conversions.
28284	*/
28285	#ifndef SQLITE_PRINTF_PRECISION_LIMIT
28286	# define SQLITE_FP_PRECISION_LIMIT 100000000
28287	#endif
28288
28289	/*
28290	** Render a string given by "fmt" into the StrAccum object.
28291	*/
28292	SQLITE_API void sqlite3_str_vappendf(
28293	sqlite3_str pAccum, / Accumulate results here */
	@@ -28474,10 +28484,12 @@
28484	** precision The specified precision. The default
28485	** is -1.
28486	** xtype The class of the conversion.
28487	** infop Pointer to the appropriate info struct.
28488	*/
28489	assert( width>=0 );
28490	assert( precision>=(-1) );
28491	switch( xtype ){
28492	case etPOINTER:
28493	flag_long = sizeof(char*)==sizeof(i64) ? 2 :
28494	sizeof(char*)==sizeof(long int) ? 1 : 0;
28495	/* Fall through into the next case */
	@@ -28595,10 +28607,15 @@
28607	}
28608	#ifdef SQLITE_OMIT_FLOATING_POINT
28609	length = 0;
28610	#else
28611	if( precision<0 ) precision = 6; /* Set default precision */
28612	#ifdef SQLITE_FP_PRECISION_LIMIT
28613	if( precision>SQLITE_FP_PRECISION_LIMIT ){
28614	precision = SQLITE_FP_PRECISION_LIMIT;
28615	}
28616	#endif
28617	if( realvalue<0.0 ){
28618	realvalue = -realvalue;
28619	prefix = '-';
28620	}else{
28621	prefix = flag_prefix;
	@@ -28877,11 +28894,11 @@
28894	}else{
28895	escarg = va_arg(ap,char*);
28896	}
28897	isnull = escarg==0;
28898	if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
28899	/* For %q, %Q, and %w, the precision is the number of bytes (or
28900	** characters if the ! flags is present) to use from the input.
28901	** Because of the extra quoting characters inserted, the number
28902	** of output characters may be larger than the precision.
28903	*/
28904	k = precision;
	@@ -29962,12 +29979,13 @@
29979	#else
29980	pWin = 0;
29981	#endif
29982	}
29983	if( pExpr->op==TK_AGG_FUNCTION ){
29984	sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s iAgg=%d agg=%p",
29985	pExpr->op2, pExpr->u.zToken, zFlgs,
29986	pExpr->iAgg, pExpr->pAggInfo);
29987	}else if( pExpr->op2!=0 ){
29988	const char *zOp2;
29989	char zBuf[8];
29990	sqlite3_snprintf(sizeof(zBuf),zBuf,"0x%02x",pExpr->op2);
29991	zOp2 = zBuf;
	@@ -30856,10 +30874,11 @@
30874	/* UTF-16 Little-endian -> UTF-8 */
30875	while( zIn<zTerm ){
30876	c = *(zIn++);
30877	c += (*(zIn++))<<8;
30878	if( c>=0xd800 && c<0xe000 ){
30879	#ifdef SQLITE_REPLACE_INVALID_UTF
30880	if( c>=0xdc00 \|\| zIn>=zTerm ){
30881	c = 0xfffd;
30882	}else{
30883	int c2 = *(zIn++);
30884	c2 += (*(zIn++))<<8;
	@@ -30868,19 +30887,27 @@
30887	c = 0xfffd;
30888	}else{
30889	c = ((c&0x3ff)<<10) + (c2&0x3ff) + 0x10000;
30890	}
30891	}
30892	#else
30893	if( zIn<zTerm ){
30894	int c2 = (*zIn++);
30895	c2 += ((*zIn++)<<8);
30896	c = (c2&0x03FF) + ((c&0x003F)<<10) + (((c&0x03C0)+0x0040)<<10);
30897	}
30898	#endif
30899	}
30900	WRITE_UTF8(z, c);
30901	}
30902	}else{
30903	/* UTF-16 Big-endian -> UTF-8 */
30904	while( zIn<zTerm ){
30905	c = (*(zIn++))<<8;
30906	c += *(zIn++);
30907	if( c>=0xd800 && c<0xe000 ){
30908	#ifdef SQLITE_REPLACE_INVALID_UTF
30909	if( c>=0xdc00 \|\| zIn>=zTerm ){
30910	c = 0xfffd;
30911	}else{
30912	int c2 = (*(zIn++))<<8;
30913	c2 += *(zIn++);
	@@ -30889,10 +30916,17 @@
30916	c = 0xfffd;
30917	}else{
30918	c = ((c&0x3ff)<<10) + (c2&0x3ff) + 0x10000;
30919	}
30920	}
30921	#else
30922	if( zIn<zTerm ){
30923	int c2 = ((*zIn++)<<8);
30924	c2 += (*zIn++);
30925	c = (c2&0x03FF) + ((c&0x003F)<<10) + (((c&0x03C0)+0x0040)<<10);
30926	}
30927	#endif
30928	}
30929	WRITE_UTF8(z, c);
30930	}
30931	}
30932	pMem->n = (int)(z - zOut);
	@@ -46821,11 +46855,13 @@
46855	pFile->pVfs = pVfs;
46856	pFile->h = h;
46857	if( isReadonly ){
46858	pFile->ctrlFlags \|= WINFILE_RDONLY;
46859	}
46860	if( (flags & SQLITE_OPEN_MAIN_DB)
46861	&& sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE)
46862	){
46863	pFile->ctrlFlags \|= WINFILE_PSOW;
46864	}
46865	pFile->lastErrno = NO_ERROR;
46866	pFile->zPath = zName;
46867	#if SQLITE_MAX_MMAP_SIZE>0
	@@ -48313,14 +48349,15 @@
48349	*/
48350	SQLITE_PRIVATE int sqlite3MemdbInit(void){
48351	sqlite3_vfs *pLower = sqlite3_vfs_find(0);
48352	int sz = pLower->szOsFile;
48353	memdb_vfs.pAppData = pLower;
48354	/* The following conditional can only be true when compiled for
48355	** Windows x86 and SQLITE_MAX_MMAP_SIZE=0. We always leave
48356	** it in, to be safe, but it is marked as NO_TEST since there
48357	** is no way to reach it under most builds. */
48358	if( sz<sizeof(MemFile) ) sz = sizeof(MemFile); /NO_TEST/
48359	memdb_vfs.szOsFile = sz;
48360	return sqlite3_vfs_register(&memdb_vfs, 0);
48361	}
48362	#endif /* SQLITE_ENABLE_DESERIALIZE */
48363
	@@ -59957,29 +59994,47 @@
59994
59995	aOut[0] = s1;
59996	aOut[1] = s2;
59997	}
59998
59999	/*
60000	** If there is the possibility of concurrent access to the SHM file
60001	** from multiple threads and/or processes, then do a memory barrier.
60002	*/
60003	static void walShmBarrier(Wal *pWal){
60004	if( pWal->exclusiveMode!=WAL_HEAPMEMORY_MODE ){
60005	sqlite3OsShmBarrier(pWal->pDbFd);
60006	}
60007	}
60008
60009	/*
60010	** Add the SQLITE_NO_TSAN as part of the return-type of a function
60011	** definition as a hint that the function contains constructs that
60012	** might give false-positive TSAN warnings.
60013	**
60014	** See tag-20200519-1.
60015	*/
60016	#if defined(__clang__) && !defined(SQLITE_NO_TSAN)
60017	# define SQLITE_NO_TSAN __attribute__((no_sanitize_thread))
60018	#else
60019	# define SQLITE_NO_TSAN
60020	#endif
60021
60022	/*
60023	** Write the header information in pWal->hdr into the wal-index.
60024	**
60025	** The checksum on pWal->hdr is updated before it is written.
60026	*/
60027	static SQLITE_NO_TSAN void walIndexWriteHdr(Wal *pWal){
60028	volatile WalIndexHdr *aHdr = walIndexHdr(pWal);
60029	const int nCksum = offsetof(WalIndexHdr, aCksum);
60030
60031	assert( pWal->writeLock );
60032	pWal->hdr.isInit = 1;
60033	pWal->hdr.iVersion = WALINDEX_MAX_VERSION;
60034	walChecksumBytes(1, (u8*)&pWal->hdr, nCksum, 0, pWal->hdr.aCksum);
60035	/* Possible TSAN false-positive. See tag-20200519-1 */
60036	memcpy((void)&aHdr[1], (const void)&pWal->hdr, sizeof(WalIndexHdr));
60037	walShmBarrier(pWal);
60038	memcpy((void)&aHdr[0], (const void)&pWal->hdr, sizeof(WalIndexHdr));
60039	}
60040
	@@ -61165,36 +61220,17 @@
61220	** cannot be backfilled from the WAL.
61221	*/
61222	mxSafeFrame = pWal->hdr.mxFrame;
61223	mxPage = pWal->hdr.nPage;
61224	for(i=1; i<WAL_NREADER; i++){
61225	u32 y = AtomicLoad(pInfo->aReadMark+i);




















61226	if( mxSafeFrame>y ){
61227	assert( y<=pWal->hdr.mxFrame );
61228	rc = walBusyLock(pWal, xBusy, pBusyArg, WAL_READ_LOCK(i), 1);
61229	if( rc==SQLITE_OK ){
61230	u32 iMark = (i==1 ? mxSafeFrame : READMARK_NOT_USED);
61231	AtomicStore(pInfo->aReadMark+i, iMark);
61232	walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
61233	}else if( rc==SQLITE_BUSY ){
61234	mxSafeFrame = y;
61235	xBusy = 0;
61236	}else{
	@@ -61208,11 +61244,11 @@
61244	rc = walIteratorInit(pWal, pInfo->nBackfill, &pIter);
61245	assert( rc==SQLITE_OK \|\| pIter==0 );
61246	}
61247
61248	if( pIter
61249	&& (rc = walBusyLock(pWal,xBusy,pBusyArg,WAL_READ_LOCK(0),1))==SQLITE_OK
61250	){
61251	u32 nBackfill = pInfo->nBackfill;
61252
61253	pInfo->nBackfillAttempted = mxSafeFrame;
61254
	@@ -61423,11 +61459,11 @@
61459	** and *pChanged is set to 1.
61460	**
61461	** If the checksum cannot be verified return non-zero. If the header
61462	** is read successfully and the checksum verified, return zero.
61463	*/
61464	static SQLITE_NO_TSAN int walIndexTryHdr(Wal pWal, int pChanged){
61465	u32 aCksum[2]; /* Checksum on the header content */
61466	WalIndexHdr h1, h2; /* Two copies of the header content */
61467	WalIndexHdr volatile aHdr; / Header in shared memory */
61468
61469	/* The first page of the wal-index must be mapped at this point. */
	@@ -61436,17 +61472,23 @@
61472	/* Read the header. This might happen concurrently with a write to the
61473	** same area of shared memory on a different CPU in a SMP,
61474	** meaning it is possible that an inconsistent snapshot is read
61475	** from the file. If this happens, return non-zero.
61476	**
61477	** tag-20200519-1:
61478	** There are two copies of the header at the beginning of the wal-index.
61479	** When reading, read [0] first then [1]. Writes are in the reverse order.
61480	** Memory barriers are used to prevent the compiler or the hardware from
61481	** reordering the reads and writes. TSAN and similar tools can sometimes
61482	** give false-positive warnings about these accesses because the tools do not
61483	** account for the double-read and the memory barrier. The use of mutexes
61484	** here would be problematic as the memory being accessed is potentially
61485	** shared among multiple processes and not all mutex implementions work
61486	** reliably in that environment.
61487	*/
61488	aHdr = walIndexHdr(pWal);
61489	memcpy(&h1, (void )&aHdr[0], sizeof(h1)); / Possible TSAN false-positive */
61490	walShmBarrier(pWal);
61491	memcpy(&h2, (void *)&aHdr[1], sizeof(h2));
61492
61493	if( memcmp(&h1, &h2, sizeof(h1))!=0 ){
61494	return 1; /* Dirty read */
	@@ -62109,16 +62151,18 @@
62151	** needs to be flushed.
62152	*/
62153	SQLITE_PRIVATE int sqlite3WalBeginReadTransaction(Wal pWal, int pChanged){
62154	int rc; /* Return code */
62155	int cnt = 0; /* Number of TryBeginRead attempts */
62156	#ifdef SQLITE_ENABLE_SNAPSHOT
62157	int bChanged = 0;
62158	WalIndexHdr *pSnapshot = pWal->pSnapshot;
62159	#endif
62160
62161	assert( pWal->ckptLock==0 );
62162
62163	#ifdef SQLITE_ENABLE_SNAPSHOT


62164	if( pSnapshot ){
62165	if( memcmp(pSnapshot, &pWal->hdr, sizeof(WalIndexHdr))!=0 ){
62166	bChanged = 1;
62167	}
62168
	@@ -62283,26 +62327,28 @@
62327	for(iHash=walFramePage(iLast); iHash>=iMinHash; iHash--){
62328	WalHashLoc sLoc; /* Hash table location */
62329	int iKey; /* Hash slot index */
62330	int nCollide; /* Number of hash collisions remaining */
62331	int rc; /* Error code */
62332	u32 iH;
62333
62334	rc = walHashGet(pWal, iHash, &sLoc);
62335	if( rc!=SQLITE_OK ){
62336	return rc;
62337	}
62338	nCollide = HASHTABLE_NSLOT;
62339	iKey = walHash(pgno);
62340	while( (iH = AtomicLoad(&sLoc.aHash[iKey]))!=0 ){
62341	u32 iFrame = iH + sLoc.iZero;
62342	if( iFrame<=iLast && iFrame>=pWal->minFrame && sLoc.aPgno[iH]==pgno ){
62343	assert( iFrame>iRead \|\| CORRUPT_DB );
62344	iRead = iFrame;
62345	}
62346	if( (nCollide--)==0 ){
62347	return SQLITE_CORRUPT_BKPT;
62348	}
62349	iKey = walNextHash(iKey);
62350	}
62351	if( iRead ) break;
62352	}
62353
62354	#ifdef SQLITE_ENABLE_EXPENSIVE_ASSERT
	@@ -97436,10 +97482,47 @@
97482	}
97483	p = p->pPrior;
97484	}while( p!=0 );
97485	return WRC_Continue;
97486	}
97487
97488	/* Increase the walkerDepth when entering a subquery, and
97489	** descrease when leaving the subquery.
97490	*/
97491	SQLITE_PRIVATE int sqlite3WalkerDepthIncrease(Walker pWalker, Select pSelect){
97492	UNUSED_PARAMETER(pSelect);
97493	pWalker->walkerDepth++;
97494	return WRC_Continue;
97495	}
97496	SQLITE_PRIVATE void sqlite3WalkerDepthDecrease(Walker pWalker, Select pSelect){
97497	UNUSED_PARAMETER(pSelect);
97498	pWalker->walkerDepth--;
97499	}
97500
97501
97502	/*
97503	** No-op routine for the parse-tree walker.
97504	**
97505	** When this routine is the Walker.xExprCallback then expression trees
97506	** are walked without any actions being taken at each node. Presumably,
97507	** when this routine is used for Walker.xExprCallback then
97508	** Walker.xSelectCallback is set to do something useful for every
97509	** subquery in the parser tree.
97510	*/
97511	SQLITE_PRIVATE int sqlite3ExprWalkNoop(Walker NotUsed, Expr NotUsed2){
97512	UNUSED_PARAMETER2(NotUsed, NotUsed2);
97513	return WRC_Continue;
97514	}
97515
97516	/*
97517	** No-op routine for the parse-tree walker for SELECT statements.
97518	** subquery in the parser tree.
97519	*/
97520	SQLITE_PRIVATE int sqlite3SelectWalkNoop(Walker NotUsed, Select NotUsed2){
97521	UNUSED_PARAMETER2(NotUsed, NotUsed2);
97522	return WRC_Continue;
97523	}
97524
97525	/************ End of walker.c ********************************************/
97526	/************ Begin file resolve.c ***************************************/
97527	/*
97528	** 2008 August 18
	@@ -97465,10 +97548,12 @@
97548	** This needs to occur when copying a TK_AGG_FUNCTION node from an
97549	** outer query into an inner subquery.
97550	**
97551	** incrAggFunctionDepth(pExpr,n) is the main routine. incrAggDepth(..)
97552	** is a helper function - a callback for the tree walker.
97553	**
97554	** See also the sqlite3WindowExtraAggFuncDepth() routine in window.c
97555	*/
97556	static int incrAggDepth(Walker pWalker, Expr pExpr){
97557	if( pExpr->op==TK_AGG_FUNCTION ) pExpr->op2 += pWalker->u.n;
97558	return WRC_Continue;
97559	}
	@@ -103206,11 +103291,14 @@
103291	op = pExpr->op;
103292	}
103293	switch( op ){
103294	case TK_AGG_COLUMN: {
103295	AggInfo *pAggInfo = pExpr->pAggInfo;
103296	struct AggInfo_col *pCol;
103297	assert( pAggInfo!=0 );
103298	assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
103299	pCol = &pAggInfo->aCol[pExpr->iAgg];
103300	if( !pAggInfo->directMode ){
103301	assert( pCol->iMem>0 );
103302	return pCol->iMem;
103303	}else if( pAggInfo->useSortingIdx ){
103304	Table *pTab = pCol->pTab;
	@@ -103506,11 +103594,14 @@
103594	sqlite3VdbeJumpHere(v, addr);
103595	break;
103596	}
103597	case TK_AGG_FUNCTION: {
103598	AggInfo *pInfo = pExpr->pAggInfo;
103599	if( pInfo==0
103600	\|\| NEVER(pExpr->iAgg<0)
103601	\|\| NEVER(pExpr->iAgg>=pInfo->nFunc)
103602	){
103603	assert( !ExprHasProperty(pExpr, EP_IntValue) );
103604	sqlite3ErrorMsg(pParse, "misuse of aggregate: %s()", pExpr->u.zToken);
103605	}else{
103606	return pInfo->aFunc[pExpr->iAgg].iMem;
103607	}
	@@ -105262,19 +105353,10 @@
105353	}
105354	}
105355	}
105356	return WRC_Continue;
105357	}









105358
105359	/*
105360	** Analyze the pExpr expression looking for aggregate functions and
105361	** for variables that need to be added to AggInfo object that pNC->pAggInfo
105362	** points to. Additional entries are made on the AggInfo object as
	@@ -105284,12 +105366,12 @@
105366	** analyzed by sqlite3ResolveExprNames().
105367	*/
105368	SQLITE_PRIVATE void sqlite3ExprAnalyzeAggregates(NameContext pNC, Expr pExpr){
105369	Walker w;
105370	w.xExprCallback = analyzeAggregate;
105371	w.xSelectCallback = sqlite3WalkerDepthIncrease;
105372	w.xSelectCallback2 = sqlite3WalkerDepthDecrease;
105373	w.walkerDepth = 0;
105374	w.u.pNC = pNC;
105375	w.pParse = 0;
105376	assert( pNC->pSrcList!=0 );
105377	sqlite3WalkExpr(&w, pExpr);
	@@ -122007,11 +122089,11 @@
122089	}
122090	if( bAffinityDone==0 && (pUpIdx==0 \|\| pUpIdx==pIdx) ){
122091	sqlite3TableAffinity(v, pTab, regNewData+1);
122092	bAffinityDone = 1;
122093	}
122094	VdbeNoopComment((v, "prep index %s", pIdx->zName));
122095	iThisCur = iIdxCur+ix;
122096
122097
122098	/* Skip partial indices for which the WHERE clause is not true */
122099	if( pIdx->pPartIdxWhere ){
	@@ -133979,33 +134061,10 @@
134061	}
134062	}
134063	return WRC_Continue;
134064	}
134065























134066	#if SQLITE_DEBUG
134067	/*
134068	** Always assert. This xSelectCallback2 implementation proves that the
134069	** xSelectCallback2 is never invoked.
134070	*/
	@@ -135172,11 +135231,11 @@
135231	sAggInfo.mxReg = pParse->nMem;
135232	if( db->mallocFailed ) goto select_end;
135233	#if SELECTTRACE_ENABLED
135234	if( sqlite3SelectTrace & 0x400 ){
135235	int ii;
135236	SELECTTRACE(0x400,pParse,p,("After aggregate analysis %p:\n", &sAggInfo));
135237	sqlite3TreeViewSelect(0, p, 0);
135238	for(ii=0; ii<sAggInfo.nColumn; ii++){
135239	sqlite3DebugPrintf("agg-column[%d] iMem=%d\n",
135240	ii, sAggInfo.aCol[ii].iMem);
135241	sqlite3TreeViewExpr(0, sAggInfo.aCol[ii].pExpr, 0);
	@@ -151215,10 +151274,27 @@
151274	if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags;
151275	}
151276	}
151277	return pList;
151278	}
151279
151280	/*
151281	** When rewriting a query, if the new subquery in the FROM clause
151282	** contains TK_AGG_FUNCTION nodes that refer to an outer query,
151283	** then we have to increase the Expr->op2 values of those nodes
151284	** due to the extra subquery layer that was added.
151285	**
151286	** See also the incrAggDepth() routine in resolve.c
151287	*/
151288	static int sqlite3WindowExtraAggFuncDepth(Walker pWalker, Expr pExpr){
151289	if( pExpr->op==TK_AGG_FUNCTION
151290	&& pExpr->op2>=pWalker->walkerDepth
151291	){
151292	pExpr->op2++;
151293	}
151294	return WRC_Continue;
151295	}
151296
151297	/*
151298	** If the SELECT statement passed as the second argument does not invoke
151299	** any SQL window functions, this function is a no-op. Otherwise, it
151300	** rewrites the SELECT statement so that window function xStep functions
	@@ -151325,10 +151401,11 @@
151401	pParse, pSublist, pSrc, pWhere, pGroupBy, pHaving, pSort, 0, 0
151402	);
151403	p->pSrc = sqlite3SrcListAppend(pParse, 0, 0, 0);
151404	if( p->pSrc ){
151405	Table *pTab2;
151406	Walker w;
151407	p->pSrc->a[0].pSelect = pSub;
151408	sqlite3SrcListAssignCursors(pParse, p->pSrc);
151409	pSub->selFlags \|= SF_Expanded;
151410	pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, SQLITE_AFF_NONE);
151411	pSub->selFlags \|= (selFlags & SF_Aggregate);
	@@ -151340,10 +151417,15 @@
151417	}else{
151418	memcpy(pTab, pTab2, sizeof(Table));
151419	pTab->tabFlags \|= TF_Ephemeral;
151420	p->pSrc->a[0].pTab = pTab;
151421	pTab = pTab2;
151422	memset(&w, 0, sizeof(w));
151423	w.xExprCallback = sqlite3WindowExtraAggFuncDepth;
151424	w.xSelectCallback = sqlite3WalkerDepthIncrease;
151425	w.xSelectCallback2 = sqlite3WalkerDepthDecrease;
151426	sqlite3WalkSelect(&w, pSub);
151427	}
151428	}else{
151429	sqlite3SelectDelete(db, pSub);
151430	}
151431	if( db->mallocFailed ) rc = SQLITE_NOMEM;
	@@ -224738,11 +224820,11 @@
224820	int nArg, /* Number of args */
224821	sqlite3_value *apUnused / Function arguments */
224822	){
224823	assert( nArg==0 );
224824	UNUSED_PARAM2(nArg, apUnused);
224825	sqlite3_result_text(pCtx, "fts5: 2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350", -1, SQLITE_TRANSIENT);
224826	}
224827
224828	/*
224829	** Return true if zName is the extension on one of the shadow tables used
224830	** by this module.
	@@ -229521,12 +229603,12 @@
229603	}
229604	#endif /* SQLITE_CORE */
229605	#endif /* !defined(SQLITE_CORE) \|\| defined(SQLITE_ENABLE_STMTVTAB) */
229606
229607	/************ End of stmt.c **********************************************/
229608	#if __LINE__!=229608
229609	#undef SQLITE_SOURCE_ID
229610	#define SQLITE_SOURCE_ID "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba8alt2"
229611	#endif
229612	/* Return the source-id for this library */
229613	SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
229614	/************************ End of sqlite3.c ****************************/
229615

M src/sqlite3.h

+3 -3

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -121,13 +121,13 @@
121	121	**
122	122	** See also: [sqlite3_libversion()],
123	123	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124	124	** [sqlite_version()] and [sqlite_source_id()].
125	125	*/
126		-#define SQLITE_VERSION "3.32.0"
127		-#define SQLITE_VERSION_NUMBER 3032000
128		-#define SQLITE_SOURCE_ID "2020-05-17 13:47:28 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469f8ece"
	126	+#define SQLITE_VERSION "3.32.1"
	127	+#define SQLITE_VERSION_NUMBER 3032001
	128	+#define SQLITE_SOURCE_ID "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
129	129
130	130	/*
131	131	** CAPI3REF: Run-Time Library Version Numbers
132	132	** KEYWORDS: sqlite3_version sqlite3_sourceid
133	133	**
134	134

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -121,13 +121,13 @@
121	**
122	** See also: [sqlite3_libversion()],
123	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124	** [sqlite_version()] and [sqlite_source_id()].
125	*/
126	#define SQLITE_VERSION "3.32.0"
127	#define SQLITE_VERSION_NUMBER 3032000
128	#define SQLITE_SOURCE_ID "2020-05-17 13:47:28 69e149f76853d196c8855fedfc98848b60fb116ac36bc08824b1a122469f8ece"
129
130	/*
131	** CAPI3REF: Run-Time Library Version Numbers
132	** KEYWORDS: sqlite3_version sqlite3_sourceid
133	**
134

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -121,13 +121,13 @@
121	**
122	** See also: [sqlite3_libversion()],
123	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124	** [sqlite_version()] and [sqlite_source_id()].
125	*/
126	#define SQLITE_VERSION "3.32.1"
127	#define SQLITE_VERSION_NUMBER 3032001
128	#define SQLITE_SOURCE_ID "2020-05-25 16:19:56 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350"
129
130	/*
131	** CAPI3REF: Run-Time Library Version Numbers
132	** KEYWORDS: sqlite3_version sqlite3_sourceid
133	**
134

M src/th_main.c

+1 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -1500,11 +1500,11 @@
1500	1500	if( argc!=3 ){
1501	1501	return Th_WrongNumArgs(interp, "unversioned content FILENAME");
1502	1502	}
1503	1503	if( Th_IsRepositoryOpen() ){
1504	1504	Blob content;
1505		- if( unversioned_content(argv[2], &content)==0 ){
	1505	+ if( unversioned_content(argv[2], &content)!=0 ){
1506	1506	Th_SetResult(interp, blob_str(&content), blob_size(&content));
1507	1507	blob_reset(&content);
1508	1508	return TH_OK;
1509	1509	}else{
1510	1510	return TH_ERROR;
1511	1511

	--- src/th_main.c
	+++ src/th_main.c
	@@ -1500,11 +1500,11 @@
1500	if( argc!=3 ){
1501	return Th_WrongNumArgs(interp, "unversioned content FILENAME");
1502	}
1503	if( Th_IsRepositoryOpen() ){
1504	Blob content;
1505	if( unversioned_content(argv[2], &content)==0 ){
1506	Th_SetResult(interp, blob_str(&content), blob_size(&content));
1507	blob_reset(&content);
1508	return TH_OK;
1509	}else{
1510	return TH_ERROR;
1511

	--- src/th_main.c
	+++ src/th_main.c
	@@ -1500,11 +1500,11 @@
1500	if( argc!=3 ){
1501	return Th_WrongNumArgs(interp, "unversioned content FILENAME");
1502	}
1503	if( Th_IsRepositoryOpen() ){
1504	Blob content;
1505	if( unversioned_content(argv[2], &content)!=0 ){
1506	Th_SetResult(interp, blob_str(&content), blob_size(&content));
1507	blob_reset(&content);
1508	return TH_OK;
1509	}else{
1510	return TH_ERROR;
1511

M src/unversioned.c

+22 -7

		--- src/unversioned.c
		+++ src/unversioned.c
		@@ -85,25 +85,40 @@
85	85	}
86	86
87	87	/*
88	88	** Initialize pContent to be the content of an unversioned file zName.
89	89	**
90		-** Return 0 on success. Return 1 if zName is not found.
	90	+** Return 0 on failures.
	91	+** Return 1 if the file is found by name.
	92	+** Return 2 if the file is found by hash.
91	93	*/
92	94	int unversioned_content(const char zName, Blob pContent){
93	95	Stmt q;
94		- int rc = 1;
	96	+ int rc = 0;
95	97	blob_init(pContent, 0, 0);
96		- db_prepare(&q, "SELECT encoding, content FROM unversioned WHERE name=%Q", zName);
	98	+ db_prepare(&q, "SELECT encoding, content FROM unversioned WHERE name=%Q",
	99	+ zName);
97	100	if( db_step(&q)==SQLITE_ROW ){
98	101	db_column_blob(&q, 1, pContent);
99	102	if( db_column_int(&q, 0)==1 ){
100	103	blob_uncompress(pContent, pContent);
101	104	}
102		- rc = 0;
	105	+ rc = 1;
103	106	}
104	107	db_finalize(&q);
	108	+ if( rc==0 && validate16(zName,-1) ){
	109	+ db_prepare(&q, "SELECT encoding, content FROM unversioned WHERE hash=%Q",
	110	+ zName);
	111	+ if( db_step(&q)==SQLITE_ROW ){
	112	+ db_column_blob(&q, 1, pContent);
	113	+ if( db_column_int(&q, 0)==1 ){
	114	+ blob_uncompress(pContent, pContent);
	115	+ }
	116	+ rc = 2;
	117	+ }
	118	+ db_finalize(&q);
	119	+ }
105	120	return rc;
106	121	}
107	122
108	123	/*
109	124	** Write unversioned content into the database.
		@@ -328,11 +343,11 @@
328	343	int i;
329	344	verify_all_options();
330	345	db_begin_transaction();
331	346	for(i=3; i<g.argc; i++){
332	347	Blob content;
333		- if( unversioned_content(g.argv[i], &content)==0 ){
	348	+ if( unversioned_content(g.argv[i], &content)!=0 ){
334	349	blob_write_to_file(&content, "-");
335	350	}
336	351	blob_reset(&content);
337	352	}
338	353	db_end_transaction(0);
		@@ -352,11 +367,11 @@
352	367	}
353	368	zTFile = fossil_temp_filename();
354	369	if( zTFile==0 ) fossil_fatal("cannot find a temporary filename");
355	370	db_begin_transaction();
356	371	content_rcvid_init("#!fossil unversioned edit");
357		- if( unversioned_content(zUVFile, &content) ){
	372	+ if( unversioned_content(zUVFile, &content)==0 ){
358	373	fossil_fatal("no such uv-file: %Q", zUVFile);
359	374	}
360	375	if( looks_like_binary(&content) ){
361	376	fossil_fatal("cannot edit binary content");
362	377	}
		@@ -381,11 +396,11 @@
381	396	blob_reset(&content);
382	397	}else if( memcmp(zCmd, "export", nCmd)==0 ){
383	398	Blob content;
384	399	verify_all_options();
385	400	if( g.argc!=5 ) usage("export UVFILE OUTPUT");
386		- if( unversioned_content(g.argv[3], &content) ){
	401	+ if( unversioned_content(g.argv[3], &content)==0 ){
387	402	fossil_fatal("no such uv-file: %Q", g.argv[3]);
388	403	}
389	404	blob_write_to_file(&content, g.argv[4]);
390	405	blob_reset(&content);
391	406	}else if( memcmp(zCmd, "hash", nCmd)==0 ){ /* undocumented */
392	407

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -85,25 +85,40 @@
85	}
86
87	/*
88	** Initialize pContent to be the content of an unversioned file zName.
89	**
90	** Return 0 on success. Return 1 if zName is not found.


91	*/
92	int unversioned_content(const char zName, Blob pContent){
93	Stmt q;
94	int rc = 1;
95	blob_init(pContent, 0, 0);
96	db_prepare(&q, "SELECT encoding, content FROM unversioned WHERE name=%Q", zName);

97	if( db_step(&q)==SQLITE_ROW ){
98	db_column_blob(&q, 1, pContent);
99	if( db_column_int(&q, 0)==1 ){
100	blob_uncompress(pContent, pContent);
101	}
102	rc = 0;
103	}
104	db_finalize(&q);












105	return rc;
106	}
107
108	/*
109	** Write unversioned content into the database.
	@@ -328,11 +343,11 @@
328	int i;
329	verify_all_options();
330	db_begin_transaction();
331	for(i=3; i<g.argc; i++){
332	Blob content;
333	if( unversioned_content(g.argv[i], &content)==0 ){
334	blob_write_to_file(&content, "-");
335	}
336	blob_reset(&content);
337	}
338	db_end_transaction(0);
	@@ -352,11 +367,11 @@
352	}
353	zTFile = fossil_temp_filename();
354	if( zTFile==0 ) fossil_fatal("cannot find a temporary filename");
355	db_begin_transaction();
356	content_rcvid_init("#!fossil unversioned edit");
357	if( unversioned_content(zUVFile, &content) ){
358	fossil_fatal("no such uv-file: %Q", zUVFile);
359	}
360	if( looks_like_binary(&content) ){
361	fossil_fatal("cannot edit binary content");
362	}
	@@ -381,11 +396,11 @@
381	blob_reset(&content);
382	}else if( memcmp(zCmd, "export", nCmd)==0 ){
383	Blob content;
384	verify_all_options();
385	if( g.argc!=5 ) usage("export UVFILE OUTPUT");
386	if( unversioned_content(g.argv[3], &content) ){
387	fossil_fatal("no such uv-file: %Q", g.argv[3]);
388	}
389	blob_write_to_file(&content, g.argv[4]);
390	blob_reset(&content);
391	}else if( memcmp(zCmd, "hash", nCmd)==0 ){ /* undocumented */
392

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -85,25 +85,40 @@
85	}
86
87	/*
88	** Initialize pContent to be the content of an unversioned file zName.
89	**
90	** Return 0 on failures.
91	** Return 1 if the file is found by name.
92	** Return 2 if the file is found by hash.
93	*/
94	int unversioned_content(const char zName, Blob pContent){
95	Stmt q;
96	int rc = 0;
97	blob_init(pContent, 0, 0);
98	db_prepare(&q, "SELECT encoding, content FROM unversioned WHERE name=%Q",
99	zName);
100	if( db_step(&q)==SQLITE_ROW ){
101	db_column_blob(&q, 1, pContent);
102	if( db_column_int(&q, 0)==1 ){
103	blob_uncompress(pContent, pContent);
104	}
105	rc = 1;
106	}
107	db_finalize(&q);
108	if( rc==0 && validate16(zName,-1) ){
109	db_prepare(&q, "SELECT encoding, content FROM unversioned WHERE hash=%Q",
110	zName);
111	if( db_step(&q)==SQLITE_ROW ){
112	db_column_blob(&q, 1, pContent);
113	if( db_column_int(&q, 0)==1 ){
114	blob_uncompress(pContent, pContent);
115	}
116	rc = 2;
117	}
118	db_finalize(&q);
119	}
120	return rc;
121	}
122
123	/*
124	** Write unversioned content into the database.
	@@ -328,11 +343,11 @@
343	int i;
344	verify_all_options();
345	db_begin_transaction();
346	for(i=3; i<g.argc; i++){
347	Blob content;
348	if( unversioned_content(g.argv[i], &content)!=0 ){
349	blob_write_to_file(&content, "-");
350	}
351	blob_reset(&content);
352	}
353	db_end_transaction(0);
	@@ -352,11 +367,11 @@
367	}
368	zTFile = fossil_temp_filename();
369	if( zTFile==0 ) fossil_fatal("cannot find a temporary filename");
370	db_begin_transaction();
371	content_rcvid_init("#!fossil unversioned edit");
372	if( unversioned_content(zUVFile, &content)==0 ){
373	fossil_fatal("no such uv-file: %Q", zUVFile);
374	}
375	if( looks_like_binary(&content) ){
376	fossil_fatal("cannot edit binary content");
377	}
	@@ -381,11 +396,11 @@
396	blob_reset(&content);
397	}else if( memcmp(zCmd, "export", nCmd)==0 ){
398	Blob content;
399	verify_all_options();
400	if( g.argc!=5 ) usage("export UVFILE OUTPUT");
401	if( unversioned_content(g.argv[3], &content)==0 ){
402	fossil_fatal("no such uv-file: %Q", g.argv[3]);
403	}
404	blob_write_to_file(&content, g.argv[4]);
405	blob_reset(&content);
406	}else if( memcmp(zCmd, "hash", nCmd)==0 ){ /* undocumented */
407

M www/changes.wiki

+6 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -1,9 +1,14 @@
1	1	<title>Change Log</title>
2	2
	3	+<a name='v2_12'></a>
	4	+<h2>Changes for Version 2.12 (pending)</h2>
	5	+
	6	+ * <i>(no changes yet...)</i>
	7	+
3	8	<a name='v2_11'></a>
4		-<h2>Changes for Version 2.11 (pending)</h2>
	9	+<h2>Changes for Version 2.11 (2020-05-25)</h2>
5	10
6	11	* Support [/md_rules\|Markdown] in the default ticket configuration.
7	12	* Timestamp strings in [./checkin_names.wiki\|object names]
8	13	can now omit punctation. So, for example, "202004181942" and
9	14	"2020-04-18 19:42" mean the same thing.
10	15

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,9 +1,14 @@
1	<title>Change Log</title>
2





3	<a name='v2_11'></a>
4	<h2>Changes for Version 2.11 (pending)</h2>
5
6	* Support [/md_rules\|Markdown] in the default ticket configuration.
7	* Timestamp strings in [./checkin_names.wiki\|object names]
8	can now omit punctation. So, for example, "202004181942" and
9	"2020-04-18 19:42" mean the same thing.
10

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,9 +1,14 @@
1	<title>Change Log</title>
2
3	<a name='v2_12'></a>
4	<h2>Changes for Version 2.12 (pending)</h2>
5
6	* <i>(no changes yet...)</i>
7
8	<a name='v2_11'></a>
9	<h2>Changes for Version 2.11 (2020-05-25)</h2>
10
11	* Support [/md_rules\|Markdown] in the default ticket configuration.
12	* Timestamp strings in [./checkin_names.wiki\|object names]
13	can now omit punctation. So, for example, "202004181942" and
14	"2020-04-18 19:42" mean the same thing.
15

Fossil SCM

Keyboard Shortcuts