From 494ba30c9b2f8c78ee6e25ca7bb8df8aa8acef87 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 29 Aug 2024 23:32:16 +0000
Subject: [PATCH 01/50] Sync the autoconf/Makefile.msc with the main
 ./Makefile.msc

FossilOrigin-Name: 9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e
---
 autoconf/Makefile.msc |  9 +++++++++
 manifest              | 12 ++++++------
 manifest.uuid         |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index a4270fb2ae..f8a65e90cc 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -301,6 +301,7 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
 # the Windows platform.
 #
 !IFNDEF OPT_FEATURE_FLAGS
+OPT_FEATURE_FLAGS = $(OPT_XTRA)
 !IF $(MINIMAL_AMALGAMATION)==0
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1
@@ -314,6 +315,14 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF
 
+# Additional feature-options above and beyond what are normally used can be
+# be added using OPTIONS=.... on the command-line.  These values are
+# appended to the OPT_FEATURE_FLAGS variable.
+#
+!IFDEF OPTIONS
+OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) $(OPTIONS)
+!ENDIF
+
 # Should the session extension be enabled?  If so, add compilation options
 # to enable it.
 #
diff --git a/manifest b/manifest
index 1a8810cd58..7fda0fd8a5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C All\smakefiles\sare\sresponsive\sto\sOPTIONS=...\scommand-line\sarguments,\sand\sadd\nthe\sRHS\svalue\sof\sOPTIONS=\sto\sbuilds\sand\sto\slemon\sand\sother\sbuild\ssteps\sthat\nmight\srespond\sto\s-D\sor\s-U\soptions.
-D 2024-08-29T18:32:56.249
+C Sync\sthe\sautoconf/Makefile.msc\swith\sthe\smain\s./Makefile.msc
+D 2024-08-29T23:32:16.773
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -17,7 +17,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.msc 7ac6c331fc3b8aa57b6782db995b8c0e49230352decd4e2662fd07c06a9ed623
+F autoconf/Makefile.msc 2aced6442addab13ed115696eba28d9ed29caa3dd604a31392c2c7a5da301492
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 42cfd21d0b19dc7d5d85fb5c405c5f3c6a4c923021c39128f6ba685355d8fd56
 F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d5893b277
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e042eb024738a83eed92cd2dfac3d2a50d2589715a3d81b1a494564dd7d8e7fa
-R f410afede94c7e996193f1f14e81b108
+P 854b3776ee1fcaa5931e3a0ed104978ca350d218e553586d1c40c2420e1be498
+R 2925596ad299ac71bd21ba5e19108337
 U drh
-Z d182fc30f4d0c921d3b91364d1eaed1e
+Z afa5bee3192039d82a156b1fe821f6e2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 21e3bcb9c3..915840033d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-854b3776ee1fcaa5931e3a0ed104978ca350d218e553586d1c40c2420e1be498
+9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e

From 11397ce1048e3ae03b333d7b2428f3fe399ffd12 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Aug 2024 01:11:19 +0000
Subject: [PATCH 02/50] In the testrunner.tcl status report, try to provide a
 rough estimate of the time remaining.

FossilOrigin-Name: 90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 7fda0fd8a5..a27e71d2a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Sync\sthe\sautoconf/Makefile.msc\swith\sthe\smain\s./Makefile.msc
-D 2024-08-29T23:32:16.773
+C In\sthe\stestrunner.tcl\sstatus\sreport,\stry\sto\sprovide\sa\srough\sestimate\sof\nthe\stime\sremaining.
+D 2024-08-30T01:11:19.367
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1714,7 +1714,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl ff5f42f683a9c868fe01a855d81b9f08e1afb031edc5c340e5cf0fe5deaa0041
+F test/testrunner.tcl 662af46f1f0a41eb197f17583698853dd130ff3d47cf136dd519c3aecd9a9d7d
 F test/testrunner_data.tcl f1cbff53fe42087cac3d43ca02f9574bd212c842307442e2b6fff2183f5ccbfe
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 854b3776ee1fcaa5931e3a0ed104978ca350d218e553586d1c40c2420e1be498
-R 2925596ad299ac71bd21ba5e19108337
+P 9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e
+R c902a48c3428870b5b8747f7667d950b
 U drh
-Z afa5bee3192039d82a156b1fe821f6e2
+Z 58e0a7f0d6d1a8c7bc1acf976af98f74
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 915840033d..c360e52b07 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e
+90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 58c718fe47..7ebb173c0c 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -476,13 +476,22 @@ proc show_status {db cls} {
                          $ne errors, $nt tests"]
 
   set srcdir [file dirname [file dirname $TRG(info_script)]]
-  set nrun 0
-  puts [format %-79s    "Running: $S(running) (max: $nJob)"]
+  set line "Running: $S(running) (max: $nJob)"
+  if {$S(running)>0 && $fin>100 && $fin>0.05*$total} {
+    # Only estimate the time remaining after completing at least 100
+    # jobs amounting to 10% of the total.  Never estimate less than
+    # 2% of the total time used so far.
+    set tmleft [expr {($tm/$fin)*($total-$fin)}]
+    if {$tmleft<0.02*$tm} {
+      set tmleft [expr {$tm*0.02}]
+    }
+    append line " est time left [elapsetime $tmleft]"
+  }
+  puts [format %-79.79s $line]
   if {$S(running)>0} {
     $db eval {
       SELECT * FROM jobs WHERE state='running' ORDER BY starttime 
     } job {
-      incr nrun
       display_job [array get job] $now
     }
   }

From 28db1a68ba14eadc5452d0c59b03326190f2d022 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Aug 2024 12:10:28 +0000
Subject: [PATCH 03/50] Improvements to "make clean" on unix.

FossilOrigin-Name: a1d775f07528192b09566ff1546b067ffbee0db5812e424e6b7f3cc33a67dc83
---
 Makefile.in   | 46 ++++++++++++++---------------------------
 main.mk       | 57 +++++++++++++++++----------------------------------
 manifest      | 14 ++++++-------
 manifest.uuid |  2 +-
 4 files changed, 42 insertions(+), 77 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d230a40acb..1be9ea8519 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1607,42 +1607,26 @@ tclextension-list:
 	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info
 
 clean:
-	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
-	rm -f sqlite3.h opcodes.*
-	rm -rf .libs .deps
-	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
-	rm -f mkkeywordhash$(BEXE) keywordhash.h
-	rm -f mksourceid$(BEXE)
-	rm -f *.da *.bb *.bbg gmon.out
-	rm -rf tsrc .target_source
+	rm -f *.lo *.la *.o *.c *.h *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE)
+	rm -rf .libs .deps tsrc libtool .target_source testrunner_*
+	rm -f lemon$(BEXE) sqlite*.tar.gz
+	rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE)
+	rm -f parse.* fts5parse.*
+	rm -rf tsrc .target_source testrunner_bld_* testdir*
 	rm -f tclsqlite3$(TEXE)
-	rm -f testfixture$(TEXE) test.db
+	rm -f $(TESTPROGS) testrunner.*
 	rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
 	rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
-	rm -f wordcount$(TEXE) changeset$(TEXE)
-	rm -f version-info$(TEXT)
-	rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
-	rm -f sqlite3.c
-	rm -f sqlite3rc.h
-	rm -f shell.c sqlite3ext.h
-	rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
-	rm -f sqlite-*-output.vsix
-	rm -f mptester mptester.exe
-	rm -f rbu rbu.exe
-	rm -f srcck1 srcck1.exe
-	rm -f fuzzershell fuzzershell.exe
-	rm -f fuzzcheck fuzzcheck.exe
-	rm -f sqldiff sqldiff.exe
-	rm -f dbhash dbhash.exe
-	rm -f fts5.* fts5parse.*
-	rm -f threadtest5
-	rm -f src-verify
-	rm -f custom.rws
-	rm -f has_tclsh84 has_tclsh85
+	rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
+	rm -f *.dll *.lib *.exp *.def *.pc *.vsix
+	rm -f sqlite3_analyzer$(TEXE)
+	rm -f mptester$(TEXE) rbu$(TEXE)	srcck1$(TEXE)
+	rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
+	rm -f threadtest5$(TEXE)
+	rm -f src-verify has_tclsh*
 
 distclean:	clean
-	rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \
-		$(TESTPROGS)
+	rm -f config.log config.status Makefile
 
 #
 # Windows section
diff --git a/main.mk b/main.mk
index 0c86c77181..b1c86a1b76 100644
--- a/main.mk
+++ b/main.mk
@@ -1130,41 +1130,22 @@ install:	sqlite3 libsqlite3.a sqlite3.h
 	mv sqlite3.h /usr/include
 
 clean:
-	rm -f *.o sqlite3 sqlite3.exe libsqlite3.a sqlite3.h opcodes.*
-	rm -f lemon lemon.exe lempar.c parse.* sqlite*.tar.gz
-	rm -f mkkeywordhash mkkeywordhash.exe keywordhash.h
-	rm -f $(PUBLISH)
-	rm -f *.da *.bb *.bbg gmon.out
-	rm -rf tsrc target_source
-	rm -f testloadext.dll libtestloadext.so
-	rm -f amalgamation-testfixture amalgamation-testfixture.exe
-	rm -f fts3-testfixture fts3-testfixture.exe
-	rm -f testfixture testfixture.exe
-	rm -f threadtest3 threadtest3.exe
-	rm -f LogEst LogEst.exe
-	rm -f fts3view fts3view.exe
-	rm -f rollback-test rollback-test.exe
-	rm -f showdb showdb.exe
-	rm -f showjournal showjournal.exe
-	rm -f showstat4 showstat4.exe
-	rm -f showwal showwal.exe
-	rm -f changeset changeset.exe
-	rm -f speedtest1 speedtest1.exe
-	rm -f wordcount wordcount.exe
-	rm -f rbu rbu.exe
-	rm -f srcck1 srcck1.exe
-	rm -f sqlite3.c sqlite3-*.c fts?amal.c tclsqlite3.c
-	rm -f sqlite3rc.h
-	rm -f shell.c sqlite3ext.h
-	rm -f sqlite3_analyzer sqlite3_analyzer.exe sqlite3_analyzer.c
-	rm -f sqlite3_expert sqlite3_expert.exe
-	rm -f sqlite-*-output.vsix
-	rm -f mptester mptester.exe
-	rm -f fuzzershell fuzzershell.exe
-	rm -f fuzzcheck fuzzcheck.exe
-	rm -f sessionfuzz
-	rm -f sqldiff sqldiff.exe
-	rm -f fts5.* fts5parse.*
-	rm -f lsm.h lsm1.c
-	rm -f threadtest5
-	rm -f src-verify
+	rm -f *.lo *.la *.o *.c *.h *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE)
+	rm -rf .libs .deps tsrc libtool target_source testrunner_*
+	rm -f lemon$(BEXE) sqlite*.tar.gz
+	rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE)
+	rm -f parse.* fts5parse.*
+	rm -rf tsrc .target_source testrunner_bld_* testdir*
+	rm -f tclsqlite3$(TEXE)
+	rm -f $(TESTPROGS) testrunner.*
+	rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
+	rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
+	rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
+	rm -f *.dll *.lib *.exp *.def *.pc *.vsix
+	rm -f sqlite3_analyzer$(TEXE)
+	rm -f mptester$(TEXE) rbu$(TEXE)	srcck1$(TEXE)
+	rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
+	rm -f threadtest5$(TEXE)
+	rm -f src-verify has_tclsh*
+
+distclean:	clean
diff --git a/manifest b/manifest
index a27e71d2a3..8b0d758af3 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C In\sthe\stestrunner.tcl\sstatus\sreport,\stry\sto\sprovide\sa\srough\sestimate\sof\nthe\stime\sremaining.
-D 2024-08-30T01:11:19.367
+C Improvements\sto\s"make\sclean"\son\sunix.
+D 2024-08-30T12:10:28.233
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in f246a6d8a8a77c35d50d5494ee9bcd8fb6f90118eff46169427f9f404057b56e
+F Makefile.in 294ce2b8b2736787ba138e22bee38f189b4543d8fdf0e9ac20227663a9b761ba
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 47dfd26a401c5a33e237ecfe126c996977f34ac44e44a1a1ebf2204abb89d483
 F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
@@ -685,7 +685,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 715c833f9733fd10b15d8773c59dd7535067d9d0f1a20073182069538f523bc7
+F main.mk 40f8cd07372d7eed2fe33403a42b82c3f5d2d46b59480444384326db70bb33f1
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e
-R c902a48c3428870b5b8747f7667d950b
+P 90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
+R b70feb67084d54fbfa3c1f525e26b680
 U drh
-Z 58e0a7f0d6d1a8c7bc1acf976af98f74
+Z 53c8e68720f3dc2301be75bf174b1201
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c360e52b07..75f611deb5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
+a1d775f07528192b09566ff1546b067ffbee0db5812e424e6b7f3cc33a67dc83

From c589d5ab06e5f98486bec6e2e402a46c456bc0ea Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Aug 2024 16:24:49 +0000
Subject: [PATCH 04/50] Rework the tool/omittest.tcl script so that it works
 with the configure-generated Makefile, and requires no arguments. Update the
 configure-generated Makefile with a new "tidy" target which is like "clean"
 except that is preserves test logs.  Use "make tidy" to force everything to
 be recompiled from scratch without destroying logs.

FossilOrigin-Name: 99491df19d68df1f0515bd5ec9240ef3dd6e0fa38a6c837a38a16a873f8e2cbb
---
 Makefile.in       |  27 ++-
 manifest          |  14 +-
 manifest.uuid     |   2 +-
 tool/omittest.tcl | 537 ++++++++++++++++------------------------------
 4 files changed, 213 insertions(+), 367 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1be9ea8519..188f94d701 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1606,15 +1606,21 @@ tclextension-uninstall:
 tclextension-list: 
 	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info
 
-clean:
-	rm -f *.lo *.la *.o *.c *.h *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE)
-	rm -rf .libs .deps tsrc libtool .target_source testrunner_*
+
+# Remove build products sufficient so that subsequent makes will recompile
+# everything from scratch.  Do not remove:
+#
+#   *   test results and test logs
+#   *   output from ./configure
+#
+tidy:
+	rm -f *.lo *.la *.o *.c *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE)
+	rm -f fts5.h keywordhash.h opcodes.h sqlite3.h sqlite3ext.h sqlite3session.h
+	rm -rf .libs .deps tsrc .target_source
 	rm -f lemon$(BEXE) sqlite*.tar.gz
 	rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE)
 	rm -f parse.* fts5parse.*
-	rm -rf tsrc .target_source testrunner_bld_* testdir*
-	rm -f tclsqlite3$(TEXE)
-	rm -f $(TESTPROGS) testrunner.*
+	rm -f tclsqlite3$(TEXE) $(TESTPROGS)
 	rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
 	rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
 	rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
@@ -1625,8 +1631,15 @@ clean:
 	rm -f threadtest5$(TEXE)
 	rm -f src-verify has_tclsh*
 
+# Removes build products and test logs.  Retains ./configure outputs.
+#
+clean:	tidy
+	rm -rf omittest* testrunner* testdir*
+
+# Clean up everything.  No exceptions.
+#
 distclean:	clean
-	rm -f config.log config.status Makefile
+	rm -f sqlite_cfg.h config.log config.status Makefile $(LIBTOOL)
 
 #
 # Windows section
diff --git a/manifest b/manifest
index 8b0d758af3..f69905679b 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Improvements\sto\s"make\sclean"\son\sunix.
-D 2024-08-30T12:10:28.233
+C Rework\sthe\stool/omittest.tcl\sscript\sso\sthat\sit\sworks\swith\sthe\nconfigure-generated\sMakefile,\sand\srequires\sno\sarguments.\nUpdate\sthe\sconfigure-generated\sMakefile\swith\sa\snew\s"tidy"\starget\swhich\nis\slike\s"clean"\sexcept\sthat\sis\spreserves\stest\slogs.\s\sUse\s"make\stidy"\sto\nforce\severything\sto\sbe\srecompiled\sfrom\sscratch\swithout\sdestroying\slogs.
+D 2024-08-30T16:24:49.358
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 294ce2b8b2736787ba138e22bee38f189b4543d8fdf0e9ac20227663a9b761ba
+F Makefile.in 77627cbeeffe23606da5663458c0f8bbb86d28e2aca270a5d9b0db8e39a54bb2
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 47dfd26a401c5a33e237ecfe126c996977f34ac44e44a1a1ebf2204abb89d483
 F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
@@ -2149,7 +2149,7 @@ F tool/mktoolzip.tcl c7a9b685f5131d755e7d941cec50cee7f34178b9e34c9a89811eeb08617
 F tool/mkvsix.tcl 67b40996a50f985a573278eea32fc5a5eb6110bdf14d33f1d8086e48c69e540a
 F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
 F tool/omittest-msvc.tcl d6b8f501ac1d7798c4126065030f89812379012cad98a1735d6d7221492abc08
-F tool/omittest.tcl e99c9fecc3f7a8ca2fa75d8ec8bdbb5acce33dc69f0c280aae53064693387f65
+F tool/omittest.tcl b8e9aae836d1659bf399f87d79f25c1b95b5db6f95338e94a0ff6ef73be6196e
 F tool/opcodesum.tcl 740ed206ba8c5040018988129abbf3089a0ccf4a
 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
 F tool/replace.tcl 511c61acfe563dfb58675efb4628bb158a13d48ff8322123ac447e9d25a82d9a
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
-R b70feb67084d54fbfa3c1f525e26b680
+P a1d775f07528192b09566ff1546b067ffbee0db5812e424e6b7f3cc33a67dc83
+R 2b82ff2fb12af001c7426b76114f4b10
 U drh
-Z 53c8e68720f3dc2301be75bf174b1201
+Z 20d7de6f9c6ec3afe4ba157bc5616eaa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 75f611deb5..a433ecb2c2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a1d775f07528192b09566ff1546b067ffbee0db5812e424e6b7f3cc33a67dc83
+99491df19d68df1f0515bd5ec9240ef3dd6e0fa38a6c837a38a16a873f8e2cbb
diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index 8862c685f8..6dc62d0884 100644
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -1,370 +1,203 @@
-# Documentation for this script. This may be output to stderr
+#!/usr/bin/tclsh
+#
+# Documentation for this script. This may be output to
 # if the script is invoked incorrectly.
+#
 set ::USAGE_MESSAGE {
 This Tcl script is used to test the various compile time options 
-available for omitting code (the SQLITE_OMIT_xxx options). It
-should be invoked as follows:
+available for building SQLite, especially options taht omit
+features (the SQLITE_OMIT_xxx options). It should be invoked as follows:
 
-    <script> ?test-symbol? ?-makefile PATH-TO-MAKEFILE? ?-skip_run?
+    ./configure CFLAGS=-O0
+    tclsh test/omittest.tcl
 
-The default value for ::MAKEFILE is "../Makefile.linux.gcc".
-
-If -skip_run option is given then only the compile part is attempted.
-
-This script builds the testfixture program and runs the SQLite test suite
-once with each SQLITE_OMIT_ option defined and then once with all options
-defined together. Each run is performed in a seperate directory created
-as a sub-directory of the current directory by the script. The output
-of the build is saved in <sub-directory>/build.log. The output of the
-test-suite is saved in <sub-directory>/test.log.
-
-Almost any SQLite makefile (except those generated by configure - see below)
-should work. The following properties are required:
-
-  * The makefile should support the "testfixture" target.
-  * The makefile should support the "test" target.
-  * The makefile should support the variable "OPTS" as a way to pass
-    options from the make command line to lemon and the C compiler.
-
-More precisely, the following two invocations must be supported:
-
-  $::MAKEBIN -f $::MAKEFILE testfixture OPTS="-DSQLITE_OMIT_ALTERTABLE=1"
-  $::MAKEBIN -f $::MAKEFILE test
-
-Makefiles generated by the sqlite configure program cannot be used as
-they do not respect the OPTS variable.
 }
 
-
-# Build a testfixture executable and run quick.test using it. The first
-# parameter is the name of the directory to create and use to run the
-# test in. The second parameter is a list of OMIT symbols to define
-# when doing so. For example:
+# List of all options to be tested.
 #
-#     run_quick_test /tmp/testdir {SQLITE_OMIT_TRIGGER SQLITE_OMIT_VIEW}
-#
-#
-proc run_quick_test {dir omit_symbol_list} {
-  # Compile the value of the OPTS Makefile variable.
-  set opts ""
-  if {$::tcl_platform(platform)=="windows"} {
-    append opts "OPTS += -DSQLITE_OS_WIN=1\n"
-    set target "testfixture.exe"
-  } else {
-    append opts "OPTS += -DSQLITE_OS_UNIX=1\n"
-  }
-  foreach sym $omit_symbol_list {
-    append opts "OPTS += -D${sym}=1\n"
-  }
+set CompileOptionsToTest {
+  SQLITE_OMIT_ALTERTABLE
+  SQLITE_OMIT_ANALYZE
+  SQLITE_OMIT_ATTACH
+  SQLITE_OMIT_AUTHORIZATION
+  SQLITE_OMIT_AUTOINCREMENT
+  SQLITE_OMIT_AUTOINIT
+  SQLITE_OMIT_AUTOMATIC_INDEX
+  SQLITE_OMIT_AUTORESET
+  SQLITE_OMIT_AUTOVACUUM
+  SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS
+  SQLITE_OMIT_BETWEEN_OPTIMIZATION
+  SQLITE_OMIT_BLOB_LITERAL
+  SQLITE_OMIT_CASE_SENSITIVE_LIKE_PRAGMA
+  SQLITE_OMIT_CAST
+  SQLITE_OMIT_CHECK
+  SQLITE_OMIT_COMPILEOPTION_DIAGS
+  SQLITE_OMIT_COMPLETE
+  SQLITE_OMIT_COMPOUND_SELECT
+  SQLITE_OMIT_CONFLICT_CLAUSE
+  SQLITE_OMIT_CTE
+  SQLITE_OMIT_DATETIME_FUNCS
+  SQLITE_OMIT_DECLTYPE
+  SQLITE_OMIT_DEPRECATED
+  SQLITE_OMIT_DESERIALIZE
+  SQLITE_OMIT_DISKIO
+  SQLITE_OMIT_EXPLAIN
+  SQLITE_OMIT_FLAG_PRAGMAS
+  SQLITE_OMIT_FLOATING_POINT
+  SQLITE_OMIT_FOREIGN_KEY
+  SQLITE_OMIT_GENERATED_COLUMNS
+  SQLITE_OMIT_GET_TABLE
+  SQLITE_OMIT_HEX_INTEGER
+  SQLITE_OMIT_INCRBLOB
+  SQLITE_OMIT_INTEGRITY_CHECK
+  SQLITE_OMIT_INTROSPECTION_PRAGMAS
+  SQLITE_OMIT_JSON
+  SQLITE_OMIT_LIKE_OPTIMIZATION
+  SQLITE_OMIT_LOAD_EXTENSION
+  SQLITE_OMIT_LOCALTIME
+  SQLITE_OMIT_LOOKASIDE
+  SQLITE_OMIT_MEMORYDB
+  SQLITE_OMIT_OR_OPTIMIZATION
+  SQLITE_OMIT_PAGER_PRAGMAS 
+  SQLITE_OMIT_PARSER_TRACE
+  SQLITE_OMIT_POPEN
+  SQLITE_OMIT_PRAGMA
+  SQLITE_OMIT_PROGRESS_CALLBACK
+  SQLITE_OMIT_QUICKBALANCE
+  SQLITE_OMIT_RANDOMNESS
+  SQLITE_OMIT_REINDEX
+  SQLITE_OMIT_SCHEMA_PRAGMAS
+  SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS
+  SQLITE_OMIT_SHARED_CACHE
+  SQLITE_OMIT_SHUTDOWN_DIRECTORIES
+  SQLITE_OMIT_SUBQUERY
+  SQLITE_OMIT_TCL_VARIABLE
+  SQLITE_OMIT_TEMPDB
+  SQLITE_OMIT_TEST_CONTROL
+  SQLITE_OMIT_TRACE
+  SQLITE_OMIT_TRIGGER
+  SQLITE_OMIT_TRUNCATE_OPTIMIZATION
+  SQLITE_OMIT_TWOSIZE_LOOKASIDE
+  SQLITE_OMIT_UPSERT
+  SQLITE_OMIT_UTF
+  SQLITE_OMIT_VACUUM
+  SQLITE_OMIT_VIEW
+  SQLITE_OMIT_VIRTUALTABLE
+  SQLITE_OMIT_WAL
+  SQLITE_OMIT_WINDOWFUNC
+  SQLITE_OMIT_WSD
+  SQLITE_OMIT_XFER_OPT
+  SQLITE_ALLOW_ROWID_IN_VIEW
+  SQLITE_DISABLE_DIRSYNC
+  SQLITE_DISABLE_FTS
+  SQLITE_DISABLE_INTRINSIC
+  SQLITE_DISABLE_LFS
+  SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
+  SQLITE_DISABLE_SKIPAHEAD_DISTINCT
+  SQLITE_ENABLE_API_ARMOR
+  SQLITE_ENABLE_ATOMIC_WRITE
+  SQLITE_ENABLE_BATCH_ATOMIC_WRITE
+  SQLITE_ENABLE_BYTECODE_VTAB
+  SQLITE_ENABLE_CEROD
+  SQLITE_ENABLE_COLUMN_METADATA
+  SQLITE_ENABLE_COLUMN_USED_MASK
+  SQLITE_ENABLE_COMMENTS
+  SQLITE_ENABLE_CORRUPT_PGNO
+  SQLITE_ENABLE_COSTMULT
+  SQLITE_ENABLE_CURSOR_HINTS
+  SQLITE_ENABLE_DBPAGE_VTAB
+  SQLITE_ENABLE_DBSTAT_VTAB
+  SQLITE_ENABLE_EXPENSIVE_ASSERT
+  SQLITE_ENABLE_EXPLAIN_COMMENTS
+  SQLITE_ENABLE_FTS
+  SQLITE_ENABLE_GEOPOLY
+  SQLITE_ENABLE_HIDDEN_COLUMNS
+  SQLITE_ENABLE_ICU
+  SQLITE_ENABLE_ICU_COLLATIONS
+  SQLITE_ENABLE_INTERNAL_FUNCTIONS
+  SQLITE_ENABLE_IOTRACE
+  SQLITE_ENABLE_LOAD_EXTENSION
+  SQLITE_ENABLE_LOCKING_STYLE
+  SQLITE_ENABLE_MATH_FUNCTIONS
+  SQLITE_ENABLE_MEMORY_MANAGEMENT
+  SQLITE_ENABLE_MEMSYS
+  SQLITE_ENABLE_MODULE_COMMENTS
+  SQLITE_ENABLE_MULTIPLEX
+  SQLITE_ENABLE_MULTITHREADED_CHECKS
+  SQLITE_ENABLE_NORMALIZE
+  SQLITE_ENABLE_NULL_TRIM
+  SQLITE_ENABLE_OFFSET_SQL_FUNC
+  SQLITE_ENABLE_OVERSIZE_CELL_CHECK
+  SQLITE_ENABLE_PREUPDATE_HOOK
+  SQLITE_ENABLE_QPSG
+  SQLITE_ENABLE_RBU
+  SQLITE_ENABLE_RTREE
+  SQLITE_ENABLE_SELECTTRACE
+  SQLITE_ENABLE_SESSION
+  SQLITE_ENABLE_SETLK_TIMEOUT
+  SQLITE_ENABLE_SNAPSHOT
+  SQLITE_ENABLE_SORTER_MMAP
+  SQLITE_ENABLE_SORTER_REFERENCE
+  SQLITE_ENABLE_SORTER_REFERENCES
+  SQLITE_ENABLE_SQLLOG
+  SQLITE_ENABLE_STAT
+  SQLITE_ENABLE_STMT_SCANSTATUS
+  SQLITE_ENABLE_STMTVTAB
+  SQLITE_ENABLE_TREETRACE
+  SQLITE_ENABLE_UNKNOWN_FUNCTION
+  SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+  SQLITE_ENABLE_UNLOCK_NOTIFY
+  SQLITE_ENABLE_UPDATE_DELETE_LIMIT
+  SQLITE_ENABLE_URI_00_ERROR
+  SQLITE_ENABLE_VFSTRACE
+  SQLITE_ENABLE_WHERETRACE
+  SQLITE_ENABLE_ZIPVFS
+}
 
-  # Create the directory and do the build. If an error occurs return
-  # early without attempting to run the test suite.
-  file mkdir $dir
-  puts -nonewline "Building $dir..."
-  flush stdout
-  catch {
-    file copy -force ./config.h $dir
-    file copy -force ./libtool $dir
-  }
-  set fd [open $::MAKEFILE]
-  set mkfile [read $fd]
-  close $fd
-  regsub {\ninclude} $mkfile "\n$opts\ninclude" mkfile
-  set fd [open $dir/makefile w]
-  puts $fd $mkfile
-  close $fd
-  
-  set rc [catch {
-    exec $::MAKEBIN -C $dir -f makefile clean $::TARGET >& $dir/build.log
-  }]
-  if {$rc} {
-    puts "No good. See $dir/build.log."
-    return
-  } else {
-    puts "Ok"
-  }
-  
-  # Create an empty file "$dir/sqlite3". This is to trick the makefile out 
-  # of trying to build the sqlite shell. The sqlite shell won't build 
-  # with some of the OMIT options (i.e OMIT_COMPLETE).
-  set sqlite3_dummy $dir/sqlite3
-  if {$::tcl_platform(platform)=="windows"} {
-    append sqlite3_dummy ".exe"
-  }
-  if {![file exists $sqlite3_dummy]} {
-    set wr [open $sqlite3_dummy w]
-    puts $wr "dummy"
-    close $wr
+# Parse command-line options.
+#
+for {set i 0} {$i<[llength $argv]} {incr i} {
+  set arg [lindex $argv $i]
+  switch -- $arg {
+    -start -
+    --start {
+      incr i
+      set startat [lindex $argv $i]
+    }
   }
+}
 
-  if {$::SKIP_RUN} {
-    #  puts "Skip testing $dir."
-  } else {
-    # Run the test suite.
-    puts -nonewline "Testing $dir..."
-    flush stdout
-    set rc [catch {
-      exec $::MAKEBIN -C $dir -f makefile test >& $dir/test.log
-    }]
-    if {$rc} {
-      puts "No good. See $dir/test.log."
+# Additional options required for some settings.
+#
+set More(SQLITE_OMIT_DISKIO) {-DSQLITE_OMIT_WAL}
+
+# Compile-time options for Mac only
+#
+set MacOnly(SQLITE_ENABLE_LOCKING_STYLE) 1
+
+file mkdir omittest
+foreach sym $CompileOptionsToTest {
+  if {[info exists startat]} {
+    if {$startat==$sym} {
+      unset startat
     } else {
-      puts "Ok"
+      continue
     }
   }
-}
-
-
-# This proc processes the command line options passed to this script.
-# Currently the only option supported is "-makefile", default
-# "../Makefile.linux-gcc". Set the ::MAKEFILE variable to the value of this
-# option.
-#
-proc process_options {argv} {
-  set ::MAKEBIN make                        ;# Default value
-  if {$::tcl_platform(platform)=="windows"} {
-    set ::MAKEFILE ./Makefile               ;# Default value on Windows
+  if {[info exists MacOnly($sym)] && $tcl_platform(os)!="Darwin"} {
+    continue
+  }
+  set logfile "omittest/$sym.log"
+  if {[info exists More($sym)]} {
+    append opts "OPT_FEATURE_FLAGS=-D$sym $More($sym)"
   } else {
-    set ::MAKEFILE ./Makefile.linux-gcc     ;# Default value
+    set opts OPT_FEATURE_FLAGS=-D$sym
   }
-  set ::SKIP_RUN 1                          ;# Default to attempt test
-  set ::TARGET testfixture                  ;# Default thing to build
-
-  for {set i 0} {$i < [llength $argv]} {incr i} {
-    switch -regexp -- [lindex $argv $i] {
-      -{1,2}makefile {
-        incr i
-        set ::MAKEFILE [lindex $argv $i]
-      }
-  
-      -{1,2}nmake {
-        set ::MAKEBIN nmake
-        set ::MAKEFILE ./Makefile.msc
-      }
-
-      -{1,2}target {
-        incr i
-        set ::TARGET [lindex $argv $i]
-      }
-
-      -{1,2}skip_run {
-        set ::SKIP_RUN 1
-      }
-      -{1,2}run {
-        set ::SKIP_RUN 0
-      }
-
-      -{1,2}help {
-        puts $::USAGE_MESSAGE
-        exit
-      }
-
-      -.* {
-        puts stderr "Unknown option: [lindex $argv i]"
-        puts stderr $::USAGE_MESSAGE
-        exit 1
-      }
-
-      default {
-        if {[info exists ::SYMBOL]} {
-          puts stderr [string trim $::USAGE_MESSAGE]
-          exit -1
-        }
-        set ::SYMBOL [lindex $argv $i]
-      }
-    }
-    set ::MAKEFILE [file normalize $::MAKEFILE]
+  puts            "make tidy sqlite3.lo $opts"
+  if {[catch {exec make tidy sqlite3.lo $opts >& $logfile}]} {
+    puts "BUILD FAILED: see $logfile for details"
+    puts "Note:  After fixes, continue the test using:\n"
+    puts "   [info nameofexe] $argv0 --start $sym\n"
+    exit 1
   }
 }
-
-# Main routine.
-#
-
-proc main {argv} {
-  # List of SQLITE_OMIT_XXX symbols supported by SQLite.
-  set ::OMIT_SYMBOLS [list \
-    SQLITE_OMIT_ALTERTABLE \
-    SQLITE_OMIT_ANALYZE \
-    SQLITE_OMIT_ATTACH \
-    SQLITE_OMIT_AUTHORIZATION \
-    SQLITE_OMIT_AUTOINCREMENT \
-    SQLITE_OMIT_AUTOINIT \
-    SQLITE_OMIT_AUTOMATIC_INDEX \
-    SQLITE_OMIT_AUTORESET \
-    SQLITE_OMIT_AUTOVACUUM \
-    SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS \
-    SQLITE_OMIT_BETWEEN_OPTIMIZATION \
-    SQLITE_OMIT_BLOB_LITERAL \
-    SQLITE_OMIT_CASE_SENSITIVE_LIKE_PRAGMA \
-    SQLITE_OMIT_CAST \
-    SQLITE_OMIT_CHECK \
-    SQLITE_OMIT_COMPILEOPTION_DIAGS \
-    SQLITE_OMIT_COMPLETE \
-    SQLITE_OMIT_COMPOUND_SELECT \
-    SQLITE_OMIT_CONFLICT_CLAUSE \
-    SQLITE_OMIT_CTE \
-    SQLITE_OMIT_DATETIME_FUNCS \
-    SQLITE_OMIT_DECLTYPE \
-    SQLITE_OMIT_DEPRECATED \
-    SQLITE_OMIT_DESERIALIZE \
-    SQLITE_OMIT_DISKIO \
-    SQLITE_OMIT_EXPLAIN \
-    SQLITE_OMIT_FLAG_PRAGMAS \
-    SQLITE_OMIT_FLOATING_POINT \
-    SQLITE_OMIT_FOREIGN_KEY \
-    SQLITE_OMIT_GENERATED_COLUMNS \
-    SQLITE_OMIT_GET_TABLE \
-    SQLITE_OMIT_HEX_INTEGER \
-    SQLITE_OMIT_INCRBLOB \
-    SQLITE_OMIT_INTEGRITY_CHECK \
-    SQLITE_OMIT_INTROSPECTION_PRAGMAS \
-    SQLITE_OMIT_JSON \
-    SQLITE_OMIT_LIKE_OPTIMIZATION \
-    SQLITE_OMIT_LOAD_EXTENSION \
-    SQLITE_OMIT_LOCALTIME \
-    SQLITE_OMIT_LOOKASIDE \
-    SQLITE_OMIT_MEMORYDB \
-    SQLITE_OMIT_OR_OPTIMIZATION \
-    SQLITE_OMIT_PAGER_PRAGMAS  \
-    SQLITE_OMIT_PARSER_TRACE \
-    SQLITE_OMIT_POPEN \
-    SQLITE_OMIT_PRAGMA \
-    SQLITE_OMIT_PROGRESS_CALLBACK \
-    SQLITE_OMIT_QUICKBALANCE \
-    SQLITE_OMIT_RANDOMNESS \
-    SQLITE_OMIT_REINDEX \
-    SQLITE_OMIT_SCHEMA_PRAGMAS \
-    SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS \
-    SQLITE_OMIT_SHARED_CACHE \
-    SQLITE_OMIT_SHUTDOWN_DIRECTORIES \
-    SQLITE_OMIT_SUBQUERY \
-    SQLITE_OMIT_TCL_VARIABLE \
-    SQLITE_OMIT_TEMPDB \
-    SQLITE_OMIT_TEST_CONTROL \
-    SQLITE_OMIT_TRACE \
-    SQLITE_OMIT_TRIGGER \
-    SQLITE_OMIT_TRUNCATE_OPTIMIZATION \
-    SQLITE_OMIT_TWOSIZE_LOOKASIDE \
-    SQLITE_OMIT_UPSERT \
-    SQLITE_OMIT_UTF \
-    SQLITE_OMIT_VACUUM \
-    SQLITE_OMIT_VIEW \
-    SQLITE_OMIT_VIRTUALTABLE \
-    SQLITE_OMIT_WAL \
-    SQLITE_OMIT_WINDOWFUNC \
-    SQLITE_OMIT_WSD \
-    SQLITE_OMIT_XFER_OPT \
-  ]
-
-  set ::ENABLE_SYMBOLS [list \
-    SQLITE_ALLOW_ROWID_IN_VIEW \
-    SQLITE_DISABLE_DIRSYNC \
-    SQLITE_DISABLE_FTS \
-    SQLITE_DISABLE_INTRINSIC \
-    SQLITE_DISABLE_LFS \
-    SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS \
-    SQLITE_DISABLE_SKIPAHEAD_DISTINCT \
-    SQLITE_ENABLE_API_ARMOR \
-    SQLITE_ENABLE_ATOMIC_WRITE \
-    SQLITE_ENABLE_BATCH_ATOMIC_WRITE \
-    SQLITE_ENABLE_BYTECODE_VTAB \
-    SQLITE_ENABLE_CEROD \
-    SQLITE_ENABLE_COLUMN_METADATA \
-    SQLITE_ENABLE_COLUMN_USED_MASK \
-    SQLITE_ENABLE_COMMENTS \
-    SQLITE_ENABLE_CORRUPT_PGNO \
-    SQLITE_ENABLE_COSTMULT \
-    SQLITE_ENABLE_CURSOR_HINTS \
-    SQLITE_ENABLE_DBPAGE_VTAB \
-    SQLITE_ENABLE_DBSTAT_VTAB \
-    SQLITE_ENABLE_EXPENSIVE_ASSERT \
-    SQLITE_ENABLE_EXPLAIN_COMMENTS \
-    SQLITE_ENABLE_FTS \
-    SQLITE_ENABLE_GEOPOLY \
-    SQLITE_ENABLE_HIDDEN_COLUMNS \
-    SQLITE_ENABLE_ICU \
-    SQLITE_ENABLE_ICU_COLLATIONS \
-    SQLITE_ENABLE_INTERNAL_FUNCTIONS \
-    SQLITE_ENABLE_IOTRACE \
-    SQLITE_ENABLE_LOAD_EXTENSION \
-    SQLITE_ENABLE_LOCKING_STYLE \
-    SQLITE_ENABLE_MATH_FUNCTIONS \
-    SQLITE_ENABLE_MEMORY_MANAGEMENT \
-    SQLITE_ENABLE_MEMSYS \
-    SQLITE_ENABLE_MODULE_COMMENTS \
-    SQLITE_ENABLE_MULTIPLEX \
-    SQLITE_ENABLE_MULTITHREADED_CHECKS \
-    SQLITE_ENABLE_NORMALIZE \
-    SQLITE_ENABLE_NULL_TRIM \
-    SQLITE_ENABLE_OFFSET_SQL_FUNC \
-    SQLITE_ENABLE_OVERSIZE_CELL_CHECK \
-    SQLITE_ENABLE_PREUPDATE_HOOK \
-    SQLITE_ENABLE_QPSG \
-    SQLITE_ENABLE_RBU \
-    SQLITE_ENABLE_RTREE \
-    SQLITE_ENABLE_SELECTTRACE \
-    SQLITE_ENABLE_SESSION \
-    SQLITE_ENABLE_SETLK_TIMEOUT \
-    SQLITE_ENABLE_SNAPSHOT \
-    SQLITE_ENABLE_SORTER_MMAP\
-    SQLITE_ENABLE_SORTER_REFERENCE \
-    SQLITE_ENABLE_SORTER_REFERENCES \
-    SQLITE_ENABLE_SQLLOG\
-    SQLITE_ENABLE_STAT \
-    SQLITE_ENABLE_STMT_SCANSTATUS \
-    SQLITE_ENABLE_STMTVTAB \
-    SQLITE_ENABLE_TREETRACE \
-    SQLITE_ENABLE_UNKNOWN_FUNCTION \
-    SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \
-    SQLITE_ENABLE_UNLOCK_NOTIFY \
-    SQLITE_ENABLE_UPDATE_DELETE_LIMIT \
-    SQLITE_ENABLE_URI_00_ERROR \
-    SQLITE_ENABLE_VFSTRACE \
-    SQLITE_ENABLE_WHERETRACE \
-    SQLITE_ENABLE_ZIPVFS \
-  ]
-
-  # Process any command line options.
-  process_options $argv
-
-  if {[info exists ::SYMBOL] } {
-    set sym $::SYMBOL
-
-    if {[lsearch $::OMIT_SYMBOLS $sym]<0 && [lsearch $::ENABLE_SYMBOLS $sym]<0} {
-      puts stderr "No such symbol: $sym"
-      exit -1
-    }
-
-    set dirname "test_[regsub -nocase {^x*SQLITE_} $sym {}]"
-    run_quick_test $dirname $sym
-  } else {
-    # First try a test with all OMIT symbols except SQLITE_OMIT_FLOATING_POINT 
-    # and SQLITE_OMIT_PRAGMA defined. The former doesn't work (causes segfaults)
-    # and the latter is currently incompatible with the test suite (this should
-    # be fixed, but it will be a lot of work).
-    set allsyms [list]
-    foreach s $::OMIT_SYMBOLS {
-      if {$s!="SQLITE_OMIT_FLOATING_POINT" && $s!="SQLITE_OMIT_PRAGMA"} {
-        lappend allsyms $s
-      }
-    }
-    run_quick_test test_OMIT_EVERYTHING $allsyms
-  
-    # Now try one quick.test with each of the OMIT symbols defined. Included
-    # are the OMIT_FLOATING_POINT and OMIT_PRAGMA symbols, even though we
-    # know they will fail. It's good to be reminded of this from time to time.
-    foreach sym $::OMIT_SYMBOLS {
-      set dirname "test_[regsub -nocase {^x*SQLITE_} $sym {}]"
-      run_quick_test $dirname $sym
-    }
-  
-    # Try the ENABLE/DISABLE symbols one at a time.  
-    # We don't do them all at once since some are conflicting.
-    foreach sym $::ENABLE_SYMBOLS {
-      set dirname "test_[regsub -nocase {^x*SQLITE_} $sym {}]"
-      run_quick_test $dirname $sym
-    }
-  }
-}
-
-main $argv

From 6cb12337b93ef782ee4ee5343e02318bb6e551e7 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Aug 2024 16:43:36 +0000
Subject: [PATCH 05/50] A couple of #defines so that the build work with
 SQLITE_OMIT_FLOATING_POINT.

FossilOrigin-Name: be768f80c703ac1645251ccbac83e07b3ea4cc231c8ea7e66374a4f78361f10b
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 src/sqliteInt.h |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index f69905679b..778729559d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\stool/omittest.tcl\sscript\sso\sthat\sit\sworks\swith\sthe\nconfigure-generated\sMakefile,\sand\srequires\sno\sarguments.\nUpdate\sthe\sconfigure-generated\sMakefile\swith\sa\snew\s"tidy"\starget\swhich\nis\slike\s"clean"\sexcept\sthat\sis\spreserves\stest\slogs.\s\sUse\s"make\stidy"\sto\nforce\severything\sto\sbe\srecompiled\sfrom\sscratch\swithout\sdestroying\slogs.
-D 2024-08-30T16:24:49.358
+C A\scouple\sof\s#defines\sso\sthat\sthe\sbuild\swork\swith\sSQLITE_OMIT_FLOATING_POINT.
+D 2024-08-30T16:43:36.050
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -770,7 +770,7 @@ F src/shell.c.in 40de636c1d90fb8a9ca7f49dc8f50d930f1b60736e73aca5eb37c4c7d0e47f9
 F src/sqlite.h.in f07bff4225a1244efd604a0ffef81ed69f29d3dbaed7e22f906f26229ba3ca9e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h 28c878bdf528879afefe1994ac007d094f8061f2fdacdc55d6055d7e9341151e
+F src/sqliteInt.h 889cd632f4386bbd8619b166abb7d25f1c8ce6514e90cb7f22f63bd530fc6107
 F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a1d775f07528192b09566ff1546b067ffbee0db5812e424e6b7f3cc33a67dc83
-R 2b82ff2fb12af001c7426b76114f4b10
+P 99491df19d68df1f0515bd5ec9240ef3dd6e0fa38a6c837a38a16a873f8e2cbb
+R 66ce867e5832770e836a59fc281bb0dd
 U drh
-Z 20d7de6f9c6ec3afe4ba157bc5616eaa
+Z 688f6234df63896134cd93de04609b1d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a433ecb2c2..24dd6be47e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-99491df19d68df1f0515bd5ec9240ef3dd6e0fa38a6c837a38a16a873f8e2cbb
+be768f80c703ac1645251ccbac83e07b3ea4cc231c8ea7e66374a4f78361f10b
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d1ffce6d87..0dab59f7a4 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -658,6 +658,8 @@
 #ifdef SQLITE_OMIT_FLOATING_POINT
 # define double sqlite_int64
 # define float sqlite_int64
+# define fabs(X) ((X)<0?-(X):(X))
+# define sqlite3IsOverflow(X) 0
 # define LONGDOUBLE_TYPE sqlite_int64
 # ifndef SQLITE_BIG_DBL
 #   define SQLITE_BIG_DBL (((sqlite3_int64)1)<<50)

From 3196c349d12c7b29917a0fec7a6a9175519a972b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 30 Aug 2024 17:33:25 +0000
Subject: [PATCH 06/50] Do not fail the omittest if ICU libraries are not
 installed.

FossilOrigin-Name: ddc55efd2d59df3f20743b0533550436da945453c069025a3f871d28d40e13d4
---
 manifest          | 13 ++++++-------
 manifest.uuid     |  2 +-
 tool/omittest.tcl | 23 ++++++++++++++++++++---
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 6e6c6cdfc8..25793c4244 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\smakefile\starget:\s"tidy".\s\sThe\s"tidy"\starget\sremoves\sall\sbuild\sproducts\nbe\sleaves\sbehind\stest\sresults.\s\sThe\s"clean"\starget\shas\sbeen\senhanced\sto\sdo\sa\nbetter\sjob.\s\sThe\stool/omittest.tcl\sscript\sis\srewritten\sto\swork\son\sthe\nconfigure-generated\sMakefile\sand\sto\srequire\sno\sarguments.
-D 2024-08-30T16:51:41.226
+C Do\snot\sfail\sthe\somittest\sif\sICU\slibraries\sare\snot\sinstalled.
+D 2024-08-30T17:33:25.286
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2149,7 +2149,7 @@ F tool/mktoolzip.tcl c7a9b685f5131d755e7d941cec50cee7f34178b9e34c9a89811eeb08617
 F tool/mkvsix.tcl 67b40996a50f985a573278eea32fc5a5eb6110bdf14d33f1d8086e48c69e540a
 F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
 F tool/omittest-msvc.tcl d6b8f501ac1d7798c4126065030f89812379012cad98a1735d6d7221492abc08
-F tool/omittest.tcl b8e9aae836d1659bf399f87d79f25c1b95b5db6f95338e94a0ff6ef73be6196e
+F tool/omittest.tcl 5ca5e4e01716d5f35b48b00fd351d929f01fbb98169a5a3cd00baf3d2e2019a9
 F tool/opcodesum.tcl 740ed206ba8c5040018988129abbf3089a0ccf4a
 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
 F tool/replace.tcl 511c61acfe563dfb58675efb4628bb158a13d48ff8322123ac447e9d25a82d9a
@@ -2211,9 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f be768f80c703ac1645251ccbac83e07b3ea4cc231c8ea7e66374a4f78361f10b
-R 66ce867e5832770e836a59fc281bb0dd
-T +closed be768f80c703ac1645251ccbac83e07b3ea4cc231c8ea7e66374a4f78361f10b
+P e48add02695a41b26a04e7942b5333e2bf4dc5598e363367aea3a4690982667d
+R 3b9cf08a862640c366f07bc714e510b5
 U drh
-Z 31439099e57d3e45a34d60d97643c90d
+Z ce5d41834ddc15c40aed5b812cb5e6fa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c48beb2f4a..0044aadb49 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e48add02695a41b26a04e7942b5333e2bf4dc5598e363367aea3a4690982667d
+ddc55efd2d59df3f20743b0533550436da945453c069025a3f871d28d40e13d4
diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index 6dc62d0884..e9033c0bdd 100644
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -175,6 +175,13 @@ set More(SQLITE_OMIT_DISKIO) {-DSQLITE_OMIT_WAL}
 #
 set MacOnly(SQLITE_ENABLE_LOCKING_STYLE) 1
 
+# Compile-time options that might fail, depending on what libraries
+# are installed.  Failures on these tests issue a warning, but testing
+# continues.
+#
+set FailIsOk(SQLITE_ENABLE_ICU) 1
+set FailIsOk(SQLITE_ENABLE_ICU_COLLATIONS) 1
+
 file mkdir omittest
 foreach sym $CompileOptionsToTest {
   if {[info exists startat]} {
@@ -196,8 +203,18 @@ foreach sym $CompileOptionsToTest {
   puts            "make tidy sqlite3.lo $opts"
   if {[catch {exec make tidy sqlite3.lo $opts >& $logfile}]} {
     puts "BUILD FAILED: see $logfile for details"
-    puts "Note:  After fixes, continue the test using:\n"
-    puts "   [info nameofexe] $argv0 --start $sym\n"
-    exit 1
+    if {[info exists FailIsOk($sym)]} {
+      set Failure($sym) 1
+    } else {
+      puts "Note:  After fixes, continue the test using:\n"
+      puts "   [info nameofexe] $argv0 --start $sym\n"
+      exit 1
+    }
+  }
+}
+if {[llength [array names Failure]]>0} {
+  puts "BUILD FAILED on the following:"
+  foreach sym [array names Failure] {
+     puts "  *  $sym"
   }
 }

From 90fa4c7b2c7653cb64a4662bc98ea73d12143b43 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 14:31:17 +0000
Subject: [PATCH 07/50] Enhance the percentile() and median() extension
 functions so that they can be window functions.

FossilOrigin-Name: 4d0e3df4b9c609755977b8a462126242d2be1310c0122a8d4ba76d98d32a7230
---
 Makefile.in           |  3 +-
 Makefile.msc          |  1 +
 ext/misc/percentile.c | 96 +++++++++++++++++++++++++++++++++++++------
 main.mk               |  1 +
 manifest              | 23 ++++++-----
 manifest.uuid         |  2 +-
 src/func.c            |  8 +++-
 7 files changed, 108 insertions(+), 26 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 188f94d701..9fcf87f941 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1182,6 +1182,7 @@ SHELL_DEP = \
     $(TOP)/ext/misc/ieee754.c \
     $(TOP)/ext/misc/memtrace.c \
     $(TOP)/ext/misc/pcachetrace.c \
+    $(TOP)/ext/misc/percentile.c \
     $(TOP)/ext/misc/regexp.c \
     $(TOP)/ext/misc/series.c \
     $(TOP)/ext/misc/shathree.c \
@@ -1390,7 +1391,7 @@ srctree-check:	$(TOP)/tool/srctree-check.tcl
 
 # Testing for a release
 #
-releasetest: srctree-check has_tclsh85
+releasetest: srctree-check has_tclsh85 verify-source
 	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl release $(TSTRNNR_OPTS)
 
 # Minimal testing that runs in less than 3 minutes
diff --git a/Makefile.msc b/Makefile.msc
index bf707edfd6..27513da12f 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2313,6 +2313,7 @@ SHELL_DEP = \
     $(TOP)\ext\misc\ieee754.c \
     $(TOP)\ext\misc\memtrace.c \
     $(TOP)\ext\misc\pcachetrace.c \
+    $(TOP)\ext\misc\percentile.c \
     $(TOP)\ext\misc\regexp.c \
     $(TOP)\ext\misc\series.c \
     $(TOP)\ext\misc\shathree.c \
diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index cccbaf0253..99b1430171 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -77,6 +77,7 @@ typedef struct Percentile Percentile;
 struct Percentile {
   unsigned nAlloc;     /* Number of slots allocated for a[] */
   unsigned nUsed;      /* Number of slots actually used in a[] */
+  char bSorted;        /* True if a[] is already in sorted order */
   double rPct;         /* 1.0 more than the value for P */
   double *a;           /* Array of Y values */
 };
@@ -183,10 +184,65 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
     p->a = a;
   }
   p->a[p->nUsed++] = y;
+  assert( p->nUsed>=1 );
+  if( p->nUsed==1 ){
+    p->bSorted = 1;
+  }else if( p->bSorted && p->a[p->nUsed-2]>y ){
+    p->bSorted = 0;
+  }
+}
+
+/*
+** The "inverse" function for percentile(Y,P) is called to remove a
+** row that was previously inserted by "step".
+*/
+static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
+  Percentile *p;
+  int eType;
+  double y;
+  int i;
+  assert( argc==2 || argc==1 );
+
+  /* Allocate the session context. */
+  p = (Percentile*)sqlite3_aggregate_context(pCtx, sizeof(*p));
+  assert( p!=0 );
+
+  /* Ignore rows for which Y is NULL */
+  eType = sqlite3_value_type(argv[0]);
+  if( eType==SQLITE_NULL ) return;
+
+  /* If not NULL, then Y must be numeric.  Otherwise throw an error.
+  ** Requirement 4 */
+  if( eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT ){
+    return;
+  }
+
+  /* Ignore the Y value if it is infinity or NaN */
+  y = sqlite3_value_double(argv[0]);
+  if( isInfinity(y) ){
+    return;
+  }
+
+  /* Find and remove the row */
+  for(i=0; i<p->nUsed && p->a[i]!=y; i++){}
+  if( i<p->nUsed ){
+    p->a[i] = p->a[p->nUsed-1];
+    p->nUsed--;
+  }
+  p->bSorted = p->nUsed<=1;
 }
 
 /*
 ** Sort an array of doubles.
+**
+** Algorithm: quicksort
+**
+** This is implemented separately rather than using the qsort() routine
+** from the standard library because:
+**
+**    (1)  To avoid a dependency on qsort()
+**    (2)  To avoid the function call to the comparison routine for each
+**         comparison.
 */
 static void sortDoubles(double *a, int n){
   int iLt;       /* Entries with index less than iLt are less than rPivot */
@@ -238,7 +294,7 @@ static void sortDoubles(double *a, int n){
 ** Called to compute the final output of percentile() and to clean
 ** up all allocated memory.
 */
-static void percentFinal(sqlite3_context *pCtx){
+static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
   Percentile *p;
   unsigned i1, i2;
   double v1, v2;
@@ -247,7 +303,10 @@ static void percentFinal(sqlite3_context *pCtx){
   if( p==0 ) return;
   if( p->a==0 ) return;
   if( p->nUsed ){
-    sortDoubles(p->a, p->nUsed);
+    if( p->bSorted==0 ){
+      sortDoubles(p->a, p->nUsed);
+      p->bSorted = 1;
+    }
     ix = (p->rPct-1.0)*(p->nUsed-1)*0.01;
     i1 = (unsigned)ix;
     i2 = ix==(double)i1 || i1==p->nUsed-1 ? i1 : i1+1;
@@ -256,9 +315,18 @@ static void percentFinal(sqlite3_context *pCtx){
     vx = v1 + (v2-v1)*(ix-i1);
     sqlite3_result_double(pCtx, vx);
   }
-  sqlite3_free(p->a);
-  memset(p, 0, sizeof(*p));
+  if( bIsFinal ){
+    sqlite3_free(p->a);
+    memset(p, 0, sizeof(*p));
+  }
 }
+static void percentFinal(sqlite3_context *pCtx){
+  percentCompute(pCtx, 1);
+}
+static void percentValue(sqlite3_context *pCtx){
+  percentCompute(pCtx, 0);
+}
+
 
 
 #ifdef _WIN32
@@ -272,18 +340,22 @@ int sqlite3_percentile_init(
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
   (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "percentile", 2, 
-                               SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
-                               0, percentStep, percentFinal);
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "median", 1, 
+  rc = sqlite3_create_window_function(db, "percentile", 2, 
                                  SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
-                                 0, percentStep, percentFinal);
+                                 percentStep, percentFinal,
+                                 percentValue, percentInverse, 0);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_window_function(db, "median", 1, 
+                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+                                 percentStep, percentFinal,
+                                 percentValue, percentInverse, 0);
+
   }
   if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "percentile_cont", 2, 
+    rc = sqlite3_create_window_function(db, "percentile_cont", 2, 
                                  SQLITE_UTF8|SQLITE_INNOCUOUS, &percentStep,
-                                 0, percentStep, percentFinal);
+                                 percentStep, percentFinal,
+                                 percentValue, percentInverse, 0);
   }
   return rc;
 }
diff --git a/main.mk b/main.mk
index b1c86a1b76..1f32c22bdf 100644
--- a/main.mk
+++ b/main.mk
@@ -764,6 +764,7 @@ SHELL_DEP = \
     $(TOP)/ext/misc/ieee754.c \
     $(TOP)/ext/misc/memtrace.c \
     $(TOP)/ext/misc/pcachetrace.c \
+    $(TOP)/ext/misc/percentile.c \
     $(TOP)/ext/misc/regexp.c \
     $(TOP)/ext/misc/series.c \
     $(TOP)/ext/misc/shathree.c \
diff --git a/manifest b/manifest
index 25793c4244..4190a7f8da 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Do\snot\sfail\sthe\somittest\sif\sICU\slibraries\sare\snot\sinstalled.
-D 2024-08-30T17:33:25.286
+C Enhance\sthe\spercentile()\sand\smedian()\sextension\sfunctions\sso\sthat\sthey\scan\sbe\nwindow\sfunctions.
+D 2024-08-31T14:31:17.092
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 77627cbeeffe23606da5663458c0f8bbb86d28e2aca270a5d9b0db8e39a54bb2
+F Makefile.in 394e8c4b17d7a25b26a379573cb74bac569e6e4e9b5f1e2cf6efd53866867054
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 47dfd26a401c5a33e237ecfe126c996977f34ac44e44a1a1ebf2204abb89d483
+F Makefile.msc 8dc55cc46fabd6a01afca3a5829c4cb69b99537e42143ca6f0bf6e811b9f5068
 F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c af1941dc87d45dd0c2698a3087fbfe9ee0d157e5e72da521430c4b784abcbe81
+F ext/misc/percentile.c 89416b108569171be1d8dda4fa2687ad116ea969b4d129d02cf3dc1fd67fc87e
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -685,7 +685,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 40f8cd07372d7eed2fe33403a42b82c3f5d2d46b59480444384326db70bb33f1
+F main.mk de83918046afeb0ac4239e88511623f3ef2a0c41aab0e2b401e0275f4fd24a8e
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -718,7 +718,7 @@ F src/delete.c 444c4d1eaac40103461e3b6f0881846dd3aafc1cec1dd169d3482fa331667da7
 F src/expr.c 6d5f2c38fe3ec06a7eac599dac822788b36064124e20112a844e9cd5156cb239
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 928ed2517e8732113d2b9821aa37af639688d752f4ea9ac6e0e393d713eeb76f
-F src/func.c 1f61e32e7a357e615b5d2e774bee563761fce4f2fd97ecb0f72c33e62a2ada5f
+F src/func.c df400a1d3f4625997d4dd8a81951c303e066277c29b861d37e03cd152d7858dd
 F src/global.c 61a419dd9e993b9be0f91de4c4ccf322b053eb829868e089f0321dd669be3b90
 F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -2211,8 +2211,11 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e48add02695a41b26a04e7942b5333e2bf4dc5598e363367aea3a4690982667d
-R 3b9cf08a862640c366f07bc714e510b5
+P ddc55efd2d59df3f20743b0533550436da945453c069025a3f871d28d40e13d4
+R 5abe90c6c09c8e29fb97dabd43182a07
+T *branch * percentile-window
+T *sym-percentile-window *
+T -sym-trunk *
 U drh
-Z ce5d41834ddc15c40aed5b812cb5e6fa
+Z 85a1ed3baf7191136421a56e2c79709a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0044aadb49..ac02b4544f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddc55efd2d59df3f20743b0533550436da945453c069025a3f871d28d40e13d4
+4d0e3df4b9c609755977b8a462126242d2be1310c0122a8d4ba76d98d32a7230
diff --git a/src/func.c b/src/func.c
index 8fcda11dc0..a634a7fbea 100644
--- a/src/func.c
+++ b/src/func.c
@@ -2049,7 +2049,11 @@ static void minMaxFinalize(sqlite3_context *context){
 ** group_concat(EXPR, ?SEPARATOR?)
 ** string_agg(EXPR, SEPARATOR)
 **
-** The SEPARATOR goes before the EXPR string.  This is tragic.  The
+** Content is accumulated in GroupConcatCtx.str with the SEPARATOR
+** coming before the EXPR value, except for the first entry which
+** omits the SEPARATOR.
+**
+** It is tragic that the SEPARATOR goes before the EXPR string.  The
 ** groupConcatInverse() implementation would have been easier if the
 ** SEPARATOR were appended after EXPR.  And the order is undocumented,
 ** so we could change it, in theory.  But the old behavior has been
@@ -2153,7 +2157,7 @@ static void groupConcatInverse(
   /* pGCC is always non-NULL since groupConcatStep() will have always
   ** run first to initialize it */
   if( ALWAYS(pGCC) ){
-    int nVS;
+    int nVS;  /* Number of characters to remove */
     /* Must call sqlite3_value_text() to convert the argument into text prior
     ** to invoking sqlite3_value_bytes(), in case the text encoding is UTF16 */
     (void)sqlite3_value_text(argv[0]);

From 129767958ae41bf0da17b69643ca061a8d4f5620 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 15:02:07 +0000
Subject: [PATCH 08/50] Test cases added.

FossilOrigin-Name: 25e68229843cc84978955817285550085d1306ba4ce3b0517dd00e5d05b9ae0a
---
 manifest             | 15 +++++-------
 manifest.uuid        |  2 +-
 test/percentile.test | 58 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 4190a7f8da..e61e0275b4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\spercentile()\sand\smedian()\sextension\sfunctions\sso\sthat\sthey\scan\sbe\nwindow\sfunctions.
-D 2024-08-31T14:31:17.092
+C Test\scases\sadded.
+D 2024-08-31T15:02:07.805
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test 74e383216a075251512d6ba98beb9dccd6da465e3f73817fc438379e3a628de7
+F test/percentile.test b30d92480943de8236c1522cace227ad354512ade699789636a4f50ba8a790a1
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,11 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ddc55efd2d59df3f20743b0533550436da945453c069025a3f871d28d40e13d4
-R 5abe90c6c09c8e29fb97dabd43182a07
-T *branch * percentile-window
-T *sym-percentile-window *
-T -sym-trunk *
+P 4d0e3df4b9c609755977b8a462126242d2be1310c0122a8d4ba76d98d32a7230
+R 06b03a21c6b126e146ea802b7b43139b
 U drh
-Z 85a1ed3baf7191136421a56e2c79709a
+Z a8a75faed57aa0d8766eb4f3377323de
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ac02b4544f..301d4eacfd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d0e3df4b9c609755977b8a462126242d2be1310c0122a8d4ba76d98d32a7230
+25e68229843cc84978955817285550085d1306ba4ce3b0517dd00e5d05b9ae0a
diff --git a/test/percentile.test b/test/percentile.test
index ab5b4883fd..92c2010f4b 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -229,4 +229,62 @@ ifcapable vtab {
   }
 }
 
+# median() as a window function.  (2024-08-31)
+#
+do_execsql_test percentile-3.0 {
+  DROP TABLE IF EXISTS t1;
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c, d);
+  INSERT INTO t1 VALUES (1, 'A', 'one',   8.4),
+                        (2, 'B', 'two',   7.1),
+                        (3, 'C', 'three', 5.9),
+                        (4, 'D', 'one',  11.0),
+                        (5, 'E', 'two',  12.5),
+                        (6, 'F', 'three', 0.0),
+                        (7, 'G', 'one',   2.7);
+}
+do_execsql_test percentile-3.1 {
+SELECT a, b, c, d,
+       group_concat(b,'.') OVER W1 AS 'elements',
+       median(d) OVER W1 AS 'median'
+  FROM t1
+ WINDOW W1 AS (ORDER BY c, a ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+} {
+  1  A  one    8.4   A.D       9.7   
+  4  D  one    11.0  A.D.G     8.4   
+  7  G  one    2.7   D.G.C     5.9   
+  3  C  three  5.9   G.C.F     2.7   
+  6  F  three  0.0   C.F.B     5.9   
+  2  B  two    7.1   F.B.E     7.1   
+  5  E  two    12.5  B.E       9.8   
+}
+do_execsql_test percentile-3.2 {
+SELECT a, b, c, d,
+       group_concat(b,'.') OVER W1 AS 'elements',
+       median(d) OVER W1 AS 'median'
+  FROM t1
+ WINDOW W1 AS (ORDER BY c, a ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)
+} {
+  1  A  one    8.4   A.D            9.7   
+  4  D  one    11.0  A.D.G          8.4   
+  7  G  one    2.7   A.D.G.C        7.15  
+  3  C  three  5.9   A.D.G.C.F      5.9   
+  6  F  three  0.0   A.D.G.C.F.B    6.5   
+  2  B  two    7.1   A.D.G.C.F.B.E  7.1   
+  5  E  two    12.5  A.D.G.C.F.B.E  7.1   
+}
+do_execsql_test percentile-3.3 {
+SELECT a, b, c, d,
+       group_concat(b,'.') OVER W1 AS 'elements',
+       median(d) OVER W1 AS 'median'
+  FROM t1
+ WINDOW W1 AS (ORDER BY c, a ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)
+} {
+  1  A  one    8.4   A.D.G.C.F.B.E  7.1   
+  4  D  one    11.0  A.D.G.C.F.B.E  7.1   
+  7  G  one    2.7   D.G.C.F.B.E    6.5   
+  3  C  three  5.9   G.C.F.B.E      5.9   
+  6  F  three  0.0   C.F.B.E        6.5   
+  2  B  two    7.1   F.B.E          7.1   
+  5  E  two    12.5  B.E            9.8   
+}
 finish_test

From ad8ec9db63f0da294625211d6f261d99685fb971 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 16:55:14 +0000
Subject: [PATCH 09/50] Avoid unnecessary sort operations when running one of
 the percentile aggregates as a window function.

FossilOrigin-Name: 5d311536211eb1e3c887ceb7e6516d3900e6eebbccc8c445dd43cdd556182728
---
 ext/misc/percentile.c | 196 ++++++++++++++++++++++++++++++------------
 manifest              |  12 +--
 manifest.uuid         |   2 +-
 3 files changed, 149 insertions(+), 61 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 99b1430171..e427497878 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -62,6 +62,29 @@
 **
 **  (14)  A separate percentile_cond(Y,X) function is the equivalent of
 **        percentile(Y,X*100.0).
+**
+**  (15)  All three SQL functions implemented by this module can also be
+**        used as window-functions.
+**
+** Implementation notes as of 2024-08-31:
+**
+**  *  The regular aggregate-function versions of the merge(), percentile(),
+**     and percentile_cond() routines work by accumulating all values in
+**     an array of doubles, then sorting that array using a quicksort
+**     before computing the answer.  Thus the runtime is O(NlogN) where
+**     N is the number of rows of input.
+**
+**  *  For the window-function versions of these routines, the array of
+**     inputs is sorted as soon as the first value is computed.  Thereafter,
+**     the array is kept in sorted order using an insert-sort.  This
+**     results in O(N*K) performance where K is the size of the window.
+**     One can devise alternative implementations that give O(N*logN*logK)
+**     performance, but they require more complex logic and data structures.
+**     The developers have elected to keep the asymptotically slower
+**     algorithm for now, for simplicity, under the theory that window
+**     functions are seldom used and when they are, the window size K is
+**     often small.  The developers might revisit that decision later,
+**     should the need arise.
 */
 #include "sqlite3ext.h"
 SQLITE_EXTENSION_INIT1
@@ -78,6 +101,7 @@ struct Percentile {
   unsigned nAlloc;     /* Number of slots allocated for a[] */
   unsigned nUsed;      /* Number of slots actually used in a[] */
   char bSorted;        /* True if a[] is already in sorted order */
+  char bKeepSorted;    /* True if advantageous to keep a[] sorted */
   double rPct;         /* 1.0 more than the value for P */
   double *a;           /* Array of Y values */
 };
@@ -85,7 +109,7 @@ struct Percentile {
 /*
 ** Return TRUE if the input floating-point number is an infinity.
 */
-static int isInfinity(double r){
+static int percentIsInfinity(double r){
   sqlite3_uint64 u;
   assert( sizeof(u)==sizeof(r) );
   memcpy(&u, &r, sizeof(u));
@@ -93,13 +117,55 @@ static int isInfinity(double r){
 }
 
 /*
-** Return TRUE if two doubles differ by 0.001 or less
+** Return TRUE if two doubles differ by 0.001 or less.
 */
-static int sameValue(double a, double b){
+static int percentSameValue(double a, double b){
   a -= b;
   return a>=-0.001 && a<=0.001;
 }
 
+#if 0
+/* Verify that the elements of the Percentile p are in fact sorted.
+** Used for testing and debugging only.
+*/
+static void percentAssertSorted(Percentile *p){
+  int i;
+  for(i=p->nUsed-2; i>=0 && p->a[i]<=p->a[i+1]; i--){}
+  assert( i<0 );
+}
+#else
+# define percentAssertSorted(X)
+#endif
+
+/*
+** Search p (which must have p->bSorted) looking for an entry with
+** value y.  Return the index of that entry.
+**
+** If bExact is true, return -1 if the entry is not found.
+**
+** If bExact is false, return the index at which a new entry with
+** value y should be insert in order to keep the values in sorted
+** order.  The smallest return value in this case will be 0, and
+** the largest return value will be p->nUsed.
+*/
+static int percentBinarySearch(Percentile *p, double y, int bExact){
+  int iFirst = 0;              /* First element of search range */
+  int iLast = p->nUsed - 1;    /* Last element of search range */
+  while( iLast>=iFirst ){
+    int iMid = (iFirst+iLast)/2;
+    double x = p->a[iMid];
+    if( x<y ){
+      iFirst = iMid + 1;
+    }else if( x>y ){
+      iLast = iMid - 1;
+    }else{
+      return iMid;
+    }
+  }
+  if( bExact ) return -1;
+  return iFirst;
+}
+
 /*
 ** The "step" function for percentile(Y,P) is called once for each
 ** input row.
@@ -145,7 +211,7 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
   ** from any prior row, per Requirement (2). */
   if( p->rPct==0.0 ){
     p->rPct = rPct+1.0;
-  }else if( !sameValue(p->rPct,rPct+1.0) ){
+  }else if( !percentSameValue(p->rPct,rPct+1.0) ){
     sqlite3_result_error(pCtx, "2nd argument to percentile() is not the "
                                "same for all input rows", -1);
     return;
@@ -165,7 +231,7 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
 
   /* Throw an error if the Y value is infinity or NaN */
   y = sqlite3_value_double(argv[0]);
-  if( isInfinity(y) ){
+  if( percentIsInfinity(y) ){
     sqlite3_result_error(pCtx, "Inf input to percentile()", -1);
     return;
   }
@@ -183,55 +249,26 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
     p->nAlloc = n;
     p->a = a;
   }
-  p->a[p->nUsed++] = y;
-  assert( p->nUsed>=1 );
-  if( p->nUsed==1 ){
+  if( p->nUsed==0 ){
+    p->a[p->nUsed++] = y;
     p->bSorted = 1;
-  }else if( p->bSorted && p->a[p->nUsed-2]>y ){
+  }else if( !p->bSorted || y>=p->a[p->nUsed-1] ){
+    p->a[p->nUsed++] = y;
+  }else if( p->bKeepSorted ){
+    int i;
+    percentAssertSorted(p);
+    i = percentBinarySearch(p, y, 0);
+    if( i<p->nUsed ){
+      memmove(&p->a[i+1], &p->a[i], (p->nUsed-i)*sizeof(p->a[0]));
+    }
+    p->a[i] = y;
+    p->nUsed++;
+  }else{
+    p->a[p->nUsed++] = y;
     p->bSorted = 0;
   }
 }
 
-/*
-** The "inverse" function for percentile(Y,P) is called to remove a
-** row that was previously inserted by "step".
-*/
-static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
-  Percentile *p;
-  int eType;
-  double y;
-  int i;
-  assert( argc==2 || argc==1 );
-
-  /* Allocate the session context. */
-  p = (Percentile*)sqlite3_aggregate_context(pCtx, sizeof(*p));
-  assert( p!=0 );
-
-  /* Ignore rows for which Y is NULL */
-  eType = sqlite3_value_type(argv[0]);
-  if( eType==SQLITE_NULL ) return;
-
-  /* If not NULL, then Y must be numeric.  Otherwise throw an error.
-  ** Requirement 4 */
-  if( eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT ){
-    return;
-  }
-
-  /* Ignore the Y value if it is infinity or NaN */
-  y = sqlite3_value_double(argv[0]);
-  if( isInfinity(y) ){
-    return;
-  }
-
-  /* Find and remove the row */
-  for(i=0; i<p->nUsed && p->a[i]!=y; i++){}
-  if( i<p->nUsed ){
-    p->a[i] = p->a[p->nUsed-1];
-    p->nUsed--;
-  }
-  p->bSorted = p->nUsed<=1;
-}
-
 /*
 ** Sort an array of doubles.
 **
@@ -290,9 +327,59 @@ static void sortDoubles(double *a, int n){
 #endif
 }
 
+
 /*
-** Called to compute the final output of percentile() and to clean
-** up all allocated memory.
+** The "inverse" function for percentile(Y,P) is called to remove a
+** row that was previously inserted by "step".
+*/
+static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
+  Percentile *p;
+  int eType;
+  double y;
+  int i;
+  assert( argc==2 || argc==1 );
+
+  /* Allocate the session context. */
+  p = (Percentile*)sqlite3_aggregate_context(pCtx, sizeof(*p));
+  assert( p!=0 );
+
+  /* Ignore rows for which Y is NULL */
+  eType = sqlite3_value_type(argv[0]);
+  if( eType==SQLITE_NULL ) return;
+
+  /* If not NULL, then Y must be numeric.  Otherwise throw an error.
+  ** Requirement 4 */
+  if( eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT ){
+    return;
+  }
+
+  /* Ignore the Y value if it is infinity or NaN */
+  y = sqlite3_value_double(argv[0]);
+  if( percentIsInfinity(y) ){
+    return;
+  }
+  if( p->bSorted==0 ){
+    sortDoubles(p->a, p->nUsed);
+    p->bSorted = 1;
+  }else{
+    percentAssertSorted(p);
+  }
+  p->bKeepSorted = 1;
+
+  /* Find and remove the row */
+  i = percentBinarySearch(p, y, 1);
+  if( i>=0 ){
+    p->nUsed--;
+    if( i<p->nUsed ){
+      memmove(&p->a[i], &p->a[i+1], (p->nUsed - i)*sizeof(p->a[0]));
+    }
+  }
+  percentAssertSorted(p);
+}
+
+/*
+** Compute the final output of percentile().  Clean up all allocated
+** memory if and only if bIsFinal is true.
 */
 static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
   Percentile *p;
@@ -306,6 +393,8 @@ static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
     if( p->bSorted==0 ){
       sortDoubles(p->a, p->nUsed);
       p->bSorted = 1;
+    }else{
+      percentAssertSorted(p);
     }
     ix = (p->rPct-1.0)*(p->nUsed-1)*0.01;
     i1 = (unsigned)ix;
@@ -318,6 +407,8 @@ static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
   if( bIsFinal ){
     sqlite3_free(p->a);
     memset(p, 0, sizeof(*p));
+  }else{
+    p->bKeepSorted = 1;
   }
 }
 static void percentFinal(sqlite3_context *pCtx){
@@ -327,8 +418,6 @@ static void percentValue(sqlite3_context *pCtx){
   percentCompute(pCtx, 0);
 }
 
-
-
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -349,7 +438,6 @@ int sqlite3_percentile_init(
                                  SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
                                  percentStep, percentFinal,
                                  percentValue, percentInverse, 0);
-
   }
   if( rc==SQLITE_OK ){
     rc = sqlite3_create_window_function(db, "percentile_cont", 2, 
diff --git a/manifest b/manifest
index e61e0275b4..e4debfefcd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\scases\sadded.
-D 2024-08-31T15:02:07.805
+C Avoid\sunnecessary\ssort\soperations\swhen\srunning\sone\sof\sthe\spercentile\naggregates\sas\sa\swindow\sfunction.
+D 2024-08-31T16:55:14.747
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 89416b108569171be1d8dda4fa2687ad116ea969b4d129d02cf3dc1fd67fc87e
+F ext/misc/percentile.c 46627b7495c69344d384f667bb6c80ba2c4aeb779997a4e22fea1a39cd20beb9
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4d0e3df4b9c609755977b8a462126242d2be1310c0122a8d4ba76d98d32a7230
-R 06b03a21c6b126e146ea802b7b43139b
+P 25e68229843cc84978955817285550085d1306ba4ce3b0517dd00e5d05b9ae0a
+R 1b58d4d1990506055e066a3b56b6ff9a
 U drh
-Z a8a75faed57aa0d8766eb4f3377323de
+Z 10ad6a710202821993e7562cc60a54b3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 301d4eacfd..1413d7e77e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-25e68229843cc84978955817285550085d1306ba4ce3b0517dd00e5d05b9ae0a
+5d311536211eb1e3c887ceb7e6516d3900e6eebbccc8c445dd43cdd556182728

From f138110dfdfac0e17f0539521e40e5d9550602cd Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 17:27:55 +0000
Subject: [PATCH 10/50] Add more test cases.

FossilOrigin-Name: 0d0e5456793b4bef673ebc7fcc1c393a6d3c817363d948ddfe06d60eab56dc24
---
 manifest             | 12 +++++------
 manifest.uuid        |  2 +-
 test/percentile.test | 47 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index e4debfefcd..df07cca990 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sunnecessary\ssort\soperations\swhen\srunning\sone\sof\sthe\spercentile\naggregates\sas\sa\swindow\sfunction.
-D 2024-08-31T16:55:14.747
+C Add\smore\stest\scases.
+D 2024-08-31T17:27:55.143
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test b30d92480943de8236c1522cace227ad354512ade699789636a4f50ba8a790a1
+F test/percentile.test 4c84880c6d5ca216206a92b6cb33c2fb27c972bec6afc6f5a2e53fb895020647
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 25e68229843cc84978955817285550085d1306ba4ce3b0517dd00e5d05b9ae0a
-R 1b58d4d1990506055e066a3b56b6ff9a
+P 5d311536211eb1e3c887ceb7e6516d3900e6eebbccc8c445dd43cdd556182728
+R 8645e4703962687ea28510b503521695
 U drh
-Z 10ad6a710202821993e7562cc60a54b3
+Z c1cee7eb4fe675aa957233112b675c53
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1413d7e77e..5c6fc432f4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5d311536211eb1e3c887ceb7e6516d3900e6eebbccc8c445dd43cdd556182728
+0d0e5456793b4bef673ebc7fcc1c393a6d3c817363d948ddfe06d60eab56dc24
diff --git a/test/percentile.test b/test/percentile.test
index 92c2010f4b..c2bc5633d2 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -287,4 +287,51 @@ SELECT a, b, c, d,
   2  B  two    7.1   F.B.E          7.1   
   5  E  two    12.5  B.E            9.8   
 }
+
+# Test case adapted from examples shown at
+# https://database.guide/3-functions-to-calculate-the-median-in-sql/
+#
+do_execsql_test percential-4.0 {
+  CREATE TABLE products(
+    vendorId INT,
+    productId INTEGER PRIMARY KEY,
+    productName REAL,
+    price REAL
+  );
+  INSERT INTO products VALUES
+    (1001, 17,  'Left-handed screwdriver', 25.99),
+    (1001, 49,  'Right-handed screwdriver', 25.99),
+    (1001, 216, 'Long weight (blue)', 14.75),
+    (1001, 31,  'Long weight (green)', 11.99),
+    (1002, 37,  'Sledge hammer', 33.49),
+    (1003, 7,   'Chainsaw', 245.00),
+    (1003, 8,   'Straw dog box', 55.99),
+    (1003, 12,  'Hammock', 11.01),
+    (1004, 113, 'Teapot', 12.45),
+    (1004, 117, 'Bottomless coffee mug', 9.99);
+}
+do_execsql_test percentile-4.1 {
+  SELECT VendorId, ProductId, /* ProductName,*/ Price,
+         avg(price) OVER (PARTITION BY vendorId) AS "Average",
+         median(price) OVER (PARTITION BY vendorId) AS "Median"
+    FROM products
+   ORDER BY vendorId, productId;
+} {
+  1001      17         25.99  19.68    20.37 
+  1001      31         11.99  19.68    20.37 
+  1001      49         25.99  19.68    20.37 
+  1001      216        14.75  19.68    20.37 
+  1002      37         33.49  33.49    33.49 
+  1003      7          245.0  104.0    55.99 
+  1003      8          55.99  104.0    55.99 
+  1003      12         11.01  104.0    55.99 
+  1004      113        12.45  11.22    11.22 
+  1004      117        9.99   11.22    11.22 
+}
+do_execsql_test percentile-4.2 {
+  SELECT vendorId, median(price) FROM products
+   GROUP BY 1 ORDER BY 1;
+} {1001 20.37 1002 33.49 1003 55.99 1004 11.22}
+
+
 finish_test

From a5315a6ecef14cd356915f7f19c0bda390d33c36 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 17:50:06 +0000
Subject: [PATCH 11/50] Still more test cases.

FossilOrigin-Name: f09904608195dac38172b0dd4dcab3190f33c116d468beff27f913a7433b400e
---
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 test/percentile.test | 46 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index df07cca990..21b3220b47 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smore\stest\scases.
-D 2024-08-31T17:27:55.143
+C Still\smore\stest\scases.
+D 2024-08-31T17:50:06.875
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test 4c84880c6d5ca216206a92b6cb33c2fb27c972bec6afc6f5a2e53fb895020647
+F test/percentile.test 9ae96346c6f5f000eeeca023cabf85efefd744f7b66031147354a4da6dcb50d6
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5d311536211eb1e3c887ceb7e6516d3900e6eebbccc8c445dd43cdd556182728
-R 8645e4703962687ea28510b503521695
+P 0d0e5456793b4bef673ebc7fcc1c393a6d3c817363d948ddfe06d60eab56dc24
+R 55d55ff8a79d8904a0d256c79a96924e
 U drh
-Z c1cee7eb4fe675aa957233112b675c53
+Z 79dbcf8ff805bbacf34d3a6772c416df
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5c6fc432f4..06468111d4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d0e5456793b4bef673ebc7fcc1c393a6d3c817363d948ddfe06d60eab56dc24
+f09904608195dac38172b0dd4dcab3190f33c116d468beff27f913a7433b400e
diff --git a/test/percentile.test b/test/percentile.test
index c2bc5633d2..c7a41bbced 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -333,5 +333,51 @@ do_execsql_test percentile-4.2 {
    GROUP BY 1 ORDER BY 1;
 } {1001 20.37 1002 33.49 1003 55.99 1004 11.22}
 
+do_execsql_test percentile-5.0 {
+  CREATE TABLE user(name TEXT, class TEXT, cost REAL);
+  INSERT INTO user VALUES
+    ('Alice', 'Y',  3578.27),
+    ('Bob',   'X',  3399.99),
+    ('Cindy', 'Z',  699.10),
+    ('Dave',  'Y',  3078.27),
+    ('Emma',  'Z',  2319.99),
+    ('Fred',  'Y',  539.99),
+    ('Gina',  'X',  2320.49),
+    ('Hank',  'W',  24.99),
+    ('Irma',  'W',  24.99),
+    ('Jake',  'X',  2234.99),
+    ('Kim',   'Y',  4319.99),
+    ('Liam',  'X',  4968.59),
+    ('Mia',   'W',  59.53),
+    ('Nate',  'W',  23.50);
+}
+do_execsql_test percentile-5.1 {
+  SELECT name, class, cost,
+    percentile_cont(cost, 0.00) OVER w1 AS 'P0',
+    percentile_cont(cost, 0.25) OVER w1 AS 'P1',
+    percentile_cont(cost, 0.50) OVER w1 AS 'P2',
+    percentile_cont(cost, 0.75) OVER w1 AS 'P3',
+    percentile_cont(cost, 1.00) OVER w1 AS 'P4'
+  FROM user
+  WINDOW w1 AS (PARTITION BY class)
+  ORDER BY class, cost;
+} {
+  Nate   W  23.5     23.5     24.6175    24.99     33.625     59.53  
+  Hank   W  24.99    23.5     24.6175    24.99     33.625     59.53  
+  Irma   W  24.99    23.5     24.6175    24.99     33.625     59.53  
+  Mia    W  59.53    23.5     24.6175    24.99     33.625     59.53  
+  Jake   X  2234.99  2234.99  2299.115   2860.24   3792.14    4968.59
+  Gina   X  2320.49  2234.99  2299.115   2860.24   3792.14    4968.59
+  Bob    X  3399.99  2234.99  2299.115   2860.24   3792.14    4968.59
+  Liam   X  4968.59  2234.99  2299.115   2860.24   3792.14    4968.59
+  Fred   Y  539.99   539.99   2443.7     3328.27   3763.7     4319.99
+  Dave   Y  3078.27  539.99   2443.7     3328.27   3763.7     4319.99
+  Alice  Y  3578.27  539.99   2443.7     3328.27   3763.7     4319.99
+  Kim    Y  4319.99  539.99   2443.7     3328.27   3763.7     4319.99
+  Cindy  Z  699.1    699.1    1104.3225  1509.545  1914.7675  2319.99
+  Emma   Z  2319.99  699.1    1104.3225  1509.545  1914.7675  2319.99
+}
+
+
 
 finish_test

From 65b12447815f2bd1a29659dd4bd54923c14da6ec Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 18:35:10 +0000
Subject: [PATCH 12/50] Omit the percentile_cont() function added by
 [095c22e62248f8ef] (and not yet released) since its usage conflicts with the
 PG percentile_cont() function.

FossilOrigin-Name: 3fe0a852978f3f1218e37a58f0d3b54016d4116a3301aa32efa7c4c12c767755
---
 ext/misc/percentile.c | 48 ++++++++++++++++++-------------------------
 manifest              | 15 +++++++-------
 manifest.uuid         |  2 +-
 test/percentile.test  | 30 +++++----------------------
 4 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index e427497878..e4b4fdf284 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -60,25 +60,34 @@
 **
 **  (13)  A separate median(Y) function is the equivalent percentile(Y,50).
 **
-**  (14)  A separate percentile_cond(Y,X) function is the equivalent of
-**        percentile(Y,X*100.0).
+**  (14)  Both median() and percentile(Y,P) can be used as window functions.
 **
-**  (15)  All three SQL functions implemented by this module can also be
-**        used as window-functions.
+** Differences from standard SQL:
+**
+**  *  The percentile(X,P) function is equivalent to the following in
+**     standard SQL:
+**
+**         (percentile(P/100.0) WITHIN GROUP (ORDER BY X))
+**
+**     The SQLite syntax is much more compact.  Note also that the
+**     range of the P argument is 0..100 in SQLite, but 0..1 in the
+**     standard.
+**
+**  *  No merge(X) function exists in the standard.  Application developers
+**     are expected to write "percentile_cont(0.5)WITHIN GROUP(ORDER BY X)".
 **
 ** Implementation notes as of 2024-08-31:
 **
-**  *  The regular aggregate-function versions of the merge(), percentile(),
-**     and percentile_cond() routines work by accumulating all values in
-**     an array of doubles, then sorting that array using a quicksort
-**     before computing the answer.  Thus the runtime is O(NlogN) where
-**     N is the number of rows of input.
+**  *  The regular aggregate-function versions of the merge() and percentile(),
+**     routines work by accumulating all values in an array of doubles, then
+**     sorting that array using a quicksort before computing the answer. Thus
+**     the runtime is O(NlogN) where N is the number of rows of input.
 **
 **  *  For the window-function versions of these routines, the array of
 **     inputs is sorted as soon as the first value is computed.  Thereafter,
 **     the array is kept in sorted order using an insert-sort.  This
 **     results in O(N*K) performance where K is the size of the window.
-**     One can devise alternative implementations that give O(N*logN*logK)
+**     One can imagine alternative implementations that give O(N*logN*logK)
 **     performance, but they require more complex logic and data structures.
 **     The developers have elected to keep the asymptotically slower
 **     algorithm for now, for simplicity, under the theory that window
@@ -180,7 +189,7 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
   if( argc==1 ){
     /* Requirement 13:  median(Y) is the same as percentile(Y,50). */
     rPct = 50.0;
-  }else if( sqlite3_user_data(pCtx)==0 ){
+  }else{
     /* Requirement 3:  P must be a number between 0 and 100 */
     eType = sqlite3_value_numeric_type(argv[1]);
     rPct = sqlite3_value_double(argv[1]);
@@ -190,17 +199,6 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
                            "a number between 0.0 and 100.0", -1);
       return;
     }
-  }else{
-    /* Requirement 3:  P must be a number between 0 and 1 */
-    eType = sqlite3_value_numeric_type(argv[1]);
-    rPct = sqlite3_value_double(argv[1]);
-    if( (eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT)
-     || rPct<0.0 || rPct>1.0 ){
-       sqlite3_result_error(pCtx, "2nd argument to percentile_cont() is not "
-                           "a number between 0.0 and 1.0", -1);
-      return;
-    }
-    rPct *= 100.0;
   }
 
   /* Allocate the session context. */
@@ -439,11 +437,5 @@ int sqlite3_percentile_init(
                                  percentStep, percentFinal,
                                  percentValue, percentInverse, 0);
   }
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_window_function(db, "percentile_cont", 2, 
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, &percentStep,
-                                 percentStep, percentFinal,
-                                 percentValue, percentInverse, 0);
-  }
   return rc;
 }
diff --git a/manifest b/manifest
index 959108d9fe..398182b5d1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\spercentile()\sand\smedian()\sto\sact\sas\swindow\sfunctions.
-D 2024-08-31T18:08:31.388
+C Omit\sthe\spercentile_cont()\sfunction\sadded\sby\s[095c22e62248f8ef]\s(and\snot\syet\nreleased)\ssince\sits\susage\sconflicts\swith\sthe\sPG\spercentile_cont()\sfunction.
+D 2024-08-31T18:35:10.951
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 46627b7495c69344d384f667bb6c80ba2c4aeb779997a4e22fea1a39cd20beb9
+F ext/misc/percentile.c c2f03cfc67a64508817fb7daf1c978ca328b0cde9105a9d7369d89061b13b3ba
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test 9ae96346c6f5f000eeeca023cabf85efefd744f7b66031147354a4da6dcb50d6
+F test/percentile.test 96b941965a5e5dff7c7d0d31c099385324897a692a300a4c4370b2fb760e7dd0
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,9 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ddc55efd2d59df3f20743b0533550436da945453c069025a3f871d28d40e13d4 f09904608195dac38172b0dd4dcab3190f33c116d468beff27f913a7433b400e
-R 55d55ff8a79d8904a0d256c79a96924e
-T +closed f09904608195dac38172b0dd4dcab3190f33c116d468beff27f913a7433b400e
+P 94cf96af8fee55449080655bddf81cbf5c078a02d7bb5dd7e4903b36f83a8c07
+R 13ad1198c1167f377793e03ac3caed1a
 U drh
-Z debd110319d009b555173f7d44f9f322
+Z bc23090135f77ee58ac855dbcaf87c06
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7061b49df1..8bf299d945 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-94cf96af8fee55449080655bddf81cbf5c078a02d7bb5dd7e4903b36f83a8c07
+3fe0a852978f3f1218e37a58f0d3b54016d4116a3301aa32efa7c4c12c767755
diff --git a/test/percentile.test b/test/percentile.test
index c7a41bbced..14e40714b0 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -42,20 +42,6 @@ do_execsql_test percentile-1.1.median {
   SELECT median(x) FROM t1;
 } 8.0
 
-foreach {in out} {
-  1.0     11.0
-  0.5      8.0
-  0.125    4.0
-  0.15     4.4
-  0.2      5.2
-  0.8     11.0
-  0.89    11.0
-} {
-  do_test percentile-1.1b-$in {
-    execsql {SELECT percentile_cont(x,$in) FROM t1}
-  } $out
-}
-
 # Add some NULL values.
 #
 do_test percentile-1.2 {
@@ -126,9 +112,6 @@ do_test percentile-1.11 {
 do_test percentile-1.12 {
   catchsql {SELECT percentile(x,x'3530') FROM t1}
 } {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
-do_test percentile-1.12b {
-  catchsql {SELECT percentile_cont(x,x'3530') FROM t1}
-} {1 {2nd argument to percentile_cont() is not a number between 0.0 and 1.0}}
 
 # Second argument is out of range
 #
@@ -138,9 +121,6 @@ do_test percentile-1.13 {
 do_test percentile-1.14 {
   catchsql {SELECT percentile(x,100.0000001) FROM t1}
 } {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
-do_test percentile-1.14b {
-  catchsql {SELECT percentile_cont(x,1.0000001) FROM t1}
-} {1 {2nd argument to percentile_cont() is not a number between 0.0 and 1.0}}
 
 # First argument is not NULL and is not NUMERIC
 #
@@ -353,11 +333,11 @@ do_execsql_test percentile-5.0 {
 }
 do_execsql_test percentile-5.1 {
   SELECT name, class, cost,
-    percentile_cont(cost, 0.00) OVER w1 AS 'P0',
-    percentile_cont(cost, 0.25) OVER w1 AS 'P1',
-    percentile_cont(cost, 0.50) OVER w1 AS 'P2',
-    percentile_cont(cost, 0.75) OVER w1 AS 'P3',
-    percentile_cont(cost, 1.00) OVER w1 AS 'P4'
+    percentile(cost,   0) OVER w1 AS 'P0',
+    percentile(cost,  25) OVER w1 AS 'P1',
+    percentile(cost,  50) OVER w1 AS 'P2',
+    percentile(cost,  75) OVER w1 AS 'P3',
+    percentile(cost, 100) OVER w1 AS 'P4'
   FROM user
   WINDOW w1 AS (PARTITION BY class)
   ORDER BY class, cost;

From c1042cd133c38e75742efd74fb50055d6c17f2c1 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 19:24:17 +0000
Subject: [PATCH 13/50] Include percentile() and merge() in the fuzzcheck test
 utility.

FossilOrigin-Name: d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
---
 Makefile.in           |  1 +
 Makefile.msc          |  1 +
 ext/misc/percentile.c | 12 ++++++++++--
 main.mk               |  1 +
 manifest              | 20 ++++++++++----------
 manifest.uuid         |  2 +-
 test/fuzzcheck.c      |  6 ++++--
 7 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 9fcf87f941..2377146417 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -650,6 +650,7 @@ FUZZCHECK_SRC += $(TOP)/test/fuzzinvariants.c
 FUZZCHECK_SRC += $(TOP)/ext/recover/dbdata.c
 FUZZCHECK_SRC += $(TOP)/ext/recover/sqlite3recover.c
 FUZZCHECK_SRC += $(TOP)/test/vt02.c
+FUZZCHECK_SRC += $(TOP)/ext/misc/percentile.c
 FUZZCHECK_SRC += $(TOP)/ext/misc/randomjson.c
 DBFUZZ_OPT =
 ST_OPT = -DSQLITE_OS_KV_OPTIONAL
diff --git a/Makefile.msc b/Makefile.msc
index 27513da12f..fde1f31a9f 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1767,6 +1767,7 @@ FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\fuzzinvariants.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\vt02.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\recover\dbdata.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\recover\sqlite3recover.c
+FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\misc\percentile.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\misc\randomjson.c
 
 OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index e4b4fdf284..3e619db69e 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -95,8 +95,12 @@
 **     often small.  The developers might revisit that decision later,
 **     should the need arise.
 */
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
+#ifdef SQLITE_STATIC_PERCENTILE
+#  include "sqlite3.h"
+#else
+#  include "sqlite3ext.h"
+   SQLITE_EXTENSION_INIT1
+#endif
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -425,7 +429,11 @@ int sqlite3_percentile_init(
   const sqlite3_api_routines *pApi
 ){
   int rc = SQLITE_OK;
+#ifdef SQLITE_STATIC_PERCENTILE
+  (void)pApi;      /* Unused parameter */
+#else
   SQLITE_EXTENSION_INIT2(pApi);
+#endif
   (void)pzErrMsg;  /* Unused parameter */
   rc = sqlite3_create_window_function(db, "percentile", 2, 
                                  SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
diff --git a/main.mk b/main.mk
index 1f32c22bdf..b379d2f8f8 100644
--- a/main.mk
+++ b/main.mk
@@ -541,6 +541,7 @@ FUZZSRC += $(TOP)/test/vt02.c
 FUZZSRC += $(TOP)/test/fuzzinvariants.c
 FUZZSRC += $(TOP)/ext/recover/dbdata.c
 FUZZSRC += $(TOP)/ext/recover/sqlite3recover.c
+FUZZSRC += $(TOP)/ext/misc/percentile.c
 FUZZSRC += $(TOP)/ext/misc/randomjson.c
 DBFUZZ_OPT =
 KV_OPT = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
diff --git a/manifest b/manifest
index 398182b5d1..1eec821886 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Omit\sthe\spercentile_cont()\sfunction\sadded\sby\s[095c22e62248f8ef]\s(and\snot\syet\nreleased)\ssince\sits\susage\sconflicts\swith\sthe\sPG\spercentile_cont()\sfunction.
-D 2024-08-31T18:35:10.951
+C Include\spercentile()\sand\smerge()\sin\sthe\sfuzzcheck\stest\sutility.
+D 2024-08-31T19:24:17.689
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 394e8c4b17d7a25b26a379573cb74bac569e6e4e9b5f1e2cf6efd53866867054
+F Makefile.in af5fbc3453b745daa68c7aa5dfdb945c09cb724971db3b783d6b5e1a62279e28
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 8dc55cc46fabd6a01afca3a5829c4cb69b99537e42143ca6f0bf6e811b9f5068
+F Makefile.msc 2c905f4c795a628d7fd892294e8fdec6d5f719fa5b252cb839fed147e64435a0
 F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c c2f03cfc67a64508817fb7daf1c978ca328b0cde9105a9d7369d89061b13b3ba
+F ext/misc/percentile.c ea1ff3561374c520193d5c3b3c86a40d922a9f0c2b48ae784d6cd9490093bd9d
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -685,7 +685,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk de83918046afeb0ac4239e88511623f3ef2a0c41aab0e2b401e0275f4fd24a8e
+F main.mk 5a2e7d4a852c058373efc78407816de41595d06975148c766092b3cf0fea4298
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -1266,7 +1266,7 @@ F test/fuzz3.test 70ba57260364b83e964707b9d4b5625284239768ab907dd387c740c0370ce3
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 6e87c27df3d95c556870187987dff6efdc712b5cea60abedc8ab9215f471907a
+F test/fuzzcheck.c 20be6c96bd0da2e91d25f089a037c1b3f8142211c97104f20629bf15610019e6
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 94cf96af8fee55449080655bddf81cbf5c078a02d7bb5dd7e4903b36f83a8c07
-R 13ad1198c1167f377793e03ac3caed1a
+P 3fe0a852978f3f1218e37a58f0d3b54016d4116a3301aa32efa7c4c12c767755
+R fe4924b06f0c2e628905b36a4804a9df
 U drh
-Z bc23090135f77ee58ac855dbcaf87c06
+Z f104fe8dff33191117d210e31173232d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8bf299d945..a1cdbd5ba6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3fe0a852978f3f1218e37a58f0d3b54016d4116a3301aa32efa7c4c12c767755
+d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index eaeb54d872..ea0d949b5b 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -159,10 +159,11 @@ static struct GlobalVars {
 } g;
 
 /*
-** Include the external vt02.c and randomjson.c modules.
+** Include various extensions.
 */
 extern int sqlite3_vt02_init(sqlite3*,char**,const sqlite3_api_routines*);
 extern int sqlite3_randomjson_init(sqlite3*,char**,const sqlite3_api_routines*);
+extern int sqlite3_percentile_init(sqlite3*,char**,const sqlite3_api_routines*);
 
 
 /*
@@ -1329,7 +1330,8 @@ int runCombinedDbSqlInput(
   /* Add the vt02 virtual table */
   sqlite3_vt02_init(cx.db, 0, 0);
 
-  /* Add the random_json() and random_json5() functions */
+  /* Activate extensions */
+  sqlite3_percentile_init(cx.db, 0, 0);
   sqlite3_randomjson_init(cx.db, 0, 0);
 
   /* Add support for sqlite_dbdata and sqlite_dbptr virtual tables used

From a239ece3781403dd43d0f4db048741a2c8184f37 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 20:09:37 +0000
Subject: [PATCH 14/50] Demonstration of how ordered-set aggregates might be
 parsed and integrated into the existing parse tree, should we decide to
 support them.

FossilOrigin-Name: ef9777890001ba0122d3add799795e118fd87243f42731ab84d4748b67605647
---
 manifest             | 19 +++++++++++--------
 manifest.uuid        |  2 +-
 src/parse.y          | 41 ++++++++++++++++++++++++++++++++++++++++-
 src/sqliteInt.h      |  3 ++-
 tool/mkkeywordhash.c |  1 +
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 1eec821886..8e2ff1cd43 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Include\spercentile()\sand\smerge()\sin\sthe\sfuzzcheck\stest\sutility.
-D 2024-08-31T19:24:17.689
+C Demonstration\sof\show\sordered-set\saggregates\smight\sbe\sparsed\sand\sintegrated\ninto\sthe\sexisting\sparse\stree,\sshould\swe\sdecide\sto\ssupport\sthem.
+D 2024-08-31T20:09:37.704
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y 5972b7d00af4c8d96fdad781af1ea1d5d51fc3b907ad61bda60e49503274e5ed
+F src/parse.y 32969201e800aa9d8238a532f66ea1c6863c16a480f540cafec7e6c352c73e52
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -770,7 +770,7 @@ F src/shell.c.in 40de636c1d90fb8a9ca7f49dc8f50d930f1b60736e73aca5eb37c4c7d0e47f9
 F src/sqlite.h.in f07bff4225a1244efd604a0ffef81ed69f29d3dbaed7e22f906f26229ba3ca9e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h 889cd632f4386bbd8619b166abb7d25f1c8ce6514e90cb7f22f63bd530fc6107
+F src/sqliteInt.h 8eac0c901803fc1fca0faa0ad28492c3b5f38c436d2f594c03308d9b955dbecb
 F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2132,7 +2132,7 @@ F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a19
 F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
 F tool/mkctimec.tcl 48ca8eefa9e615cb9057ce6485b9c9ae5801381f24690d7d60b3b2dc8e6b7457 x
-F tool/mkkeywordhash.c b9faa0ae7e14e4dbbcd951cddd786bf46b8a65bb07b129ba8c0cfade723aaffd
+F tool/mkkeywordhash.c d2d7369faacb45e7ec089ccbc2fd48e2fcab3d62d3533648c4017d5df1abd37d
 F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
 F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
@@ -2211,8 +2211,11 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3fe0a852978f3f1218e37a58f0d3b54016d4116a3301aa32efa7c4c12c767755
-R fe4924b06f0c2e628905b36a4804a9df
+P d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
+R d8caee9c6c8e089bfb48a8d01fa2ad93
+T *branch * ordered-set-agg
+T *sym-ordered-set-agg *
+T -sym-trunk *
 U drh
-Z f104fe8dff33191117d210e31173232d
+Z b43c798c432268071337348d4788bafe
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a1cdbd5ba6..2d0708c71b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
+ef9777890001ba0122d3add799795e118fd87243f42731ab84d4748b67605647
diff --git a/src/parse.y b/src/parse.y
index 926dd6e7d1..efcde10e64 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -255,7 +255,7 @@ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,A,Y);}
   EACH END EXCLUSIVE EXPLAIN FAIL FOR
   IGNORE IMMEDIATE INITIALLY INSTEAD LIKE_KW MATCH NO PLAN
   QUERY KEY OF OFFSET PRAGMA RAISE RECURSIVE RELEASE REPLACE RESTRICT ROW ROWS
-  ROLLBACK SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL WITH WITHOUT
+  ROLLBACK SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL WITH WITHIN WITHOUT
   NULLS FIRST LAST
 %ifdef SQLITE_OMIT_COMPOUND_SELECT
   EXCEPT INTERSECT UNION
@@ -1179,6 +1179,39 @@ expr(A) ::= idj(X) LP STAR RP. {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
 }
 
+%include {
+  /* Generate an expression node that represents an ordered-set aggregate function */
+  static Expr *sqlite3ExprAddOrderedsetFunction(
+    Parse *pParse,         /* Parsing context */
+    Token *pFuncname,      /* Name of the function */
+    int isDistinct,        /* DISTINCT or ALL qualifier */
+    ExprList *pOrig,       /* Arguments to the function */
+    Expr *pOrderby         /* Expression in the ORDER BY clause */                
+  ){
+    ExprList *p;           /* Modified argument list */
+    Expr *pExpr;           /* Final result */
+    p = sqlite3ExprListAppend(pParse, 0, pOrderby);
+    if( pOrig ){
+      int i;
+      for(i=0; i<pOrig->nExpr; i++){
+        p = sqlite3ExprListAppend(pParse, p, pOrig->a[i].pExpr);
+        pOrig->a[i].pExpr = 0;
+      }
+      sqlite3ExprListDelete(pParse->db, pOrig);
+    }
+    if( isDistinct==SF_Distinct ){
+      sqlite3ErrorMsg(pParse, "DISTINCT not allows on ordered-set aggregate %T()",
+                      pFuncname);
+    }
+    pExpr = sqlite3ExprFunction(pParse, p, pFuncname, 0);
+    if( pExpr ) pExpr->iTable = 1;
+    return pExpr;
+  }
+}
+expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP. {
+  A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
+}
+
 %ifndef SQLITE_OMIT_WINDOWFUNC
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP filter_over(Z). {
   A = sqlite3ExprFunction(pParse, Y, &X, D);
@@ -1193,6 +1226,12 @@ expr(A) ::= idj(X) LP STAR RP filter_over(Z). {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
   sqlite3WindowAttach(pParse, A, Z);
 }
+expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP
+            filter_over(Z). {
+  A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
+  sqlite3WindowAttach(pParse, A, Z);
+}
+
 %endif
 
 term(A) ::= CTIME_KW(OP). {
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0dab59f7a4..dcadec78d7 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3049,7 +3049,8 @@ struct Expr {
                          ** EP_Unlikely:  134217728 times likelihood
                          ** TK_IN: ephemeral table holding RHS
                          ** TK_SELECT_COLUMN: Number of columns on the LHS
-                         ** TK_SELECT: 1st register of result vector */
+                         ** TK_SELECT: 1st register of result vector
+                         ** TK_FUNCTION: Uses ordered-set aggregate syntax */
   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.
                          ** TK_VARIABLE: variable number (always >= 1).
                          ** TK_SELECT_COLUMN: column of the result vector */
diff --git a/tool/mkkeywordhash.c b/tool/mkkeywordhash.c
index 5386a36c40..d4d04da6e3 100644
--- a/tool/mkkeywordhash.c
+++ b/tool/mkkeywordhash.c
@@ -316,6 +316,7 @@ static Keyword aKeywordTable[] = {
   { "WHERE",            "TK_WHERE",        ALWAYS,           10     },
   { "WINDOW",           "TK_WINDOW",       WINDOWFUNC,       3      },
   { "WITH",             "TK_WITH",         CTE,              4      },
+  { "WITHIN",           "TK_WITHIN",       ALWAYS,           1      },
   { "WITHOUT",          "TK_WITHOUT",      ALWAYS,           1      },
 };
 

From df2d14b86e8d6d990ed9d5dd5b620fed5ece6adc Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 31 Aug 2024 22:22:24 +0000
Subject: [PATCH 15/50] Add error checking: Do not allow functions other than
 those in the percentile extension to use the ordered-set aggregate notation.

FossilOrigin-Name: 317d901429303340290334dbe7680a36339df0a50b586e3f71b6c5e5eba6d411
---
 ext/misc/percentile.c | 10 ++++------
 manifest              | 25 +++++++++++--------------
 manifest.uuid         |  2 +-
 src/main.c            |  3 ++-
 src/parse.y           |  2 +-
 src/resolve.c         |  4 ++++
 src/sqlite.h.in       |  8 ++++++++
 src/sqliteInt.h       |  4 ++--
 8 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 3e619db69e..ead3f61276 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -436,14 +436,12 @@ int sqlite3_percentile_init(
 #endif
   (void)pzErrMsg;  /* Unused parameter */
   rc = sqlite3_create_window_function(db, "percentile", 2, 
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
-                                 percentStep, percentFinal,
-                                 percentValue, percentInverse, 0);
+          SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_SELFORDER1, 0,
+          percentStep, percentFinal, percentValue, percentInverse, 0);
   if( rc==SQLITE_OK ){
     rc = sqlite3_create_window_function(db, "median", 1, 
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
-                                 percentStep, percentFinal,
-                                 percentValue, percentInverse, 0);
+          SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_SELFORDER1, 0,
+          percentStep, percentFinal, percentValue, percentInverse, 0);
   }
   return rc;
 }
diff --git a/manifest b/manifest
index 8e2ff1cd43..34c4430186 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Demonstration\sof\show\sordered-set\saggregates\smight\sbe\sparsed\sand\sintegrated\ninto\sthe\sexisting\sparse\stree,\sshould\swe\sdecide\sto\ssupport\sthem.
-D 2024-08-31T20:09:37.704
+C Add\serror\schecking:\sDo\snot\sallow\sfunctions\sother\sthan\sthose\sin\sthe\npercentile\sextension\sto\suse\sthe\sordered-set\saggregate\snotation.
+D 2024-08-31T22:22:24.013
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c ea1ff3561374c520193d5c3b3c86a40d922a9f0c2b48ae784d6cd9490093bd9d
+F ext/misc/percentile.c 487b44e4f90674b1006e7309f22d37f4dedfa251b1f6e3e803dae56ceced14ee
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -728,7 +728,7 @@ F src/insert.c f8d1a0f8ee258411009c6b7f2d93170e351bd19f5ad89d57e1180644297cbe70
 F src/json.c 5b6a1d6015997b9ee848a32948720bdb26a0ef2de5a2127ebf7355ce66dbdc0d
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
-F src/main.c a520c325c7400b249242945f2c602acb19662c40f5db1c04d88664cfaa8b85ac
+F src/main.c e7b53893f9fb3ad76baa8513f85c167b34d5c8e25ce64608db440f5637d0fe9e
 F src/malloc.c 410e570b30c26cc36e3372577df50f7a96ee3eed5b2b161c6b6b48773c650c5e
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y 32969201e800aa9d8238a532f66ea1c6863c16a480f540cafec7e6c352c73e52
+F src/parse.y 93b0f932dbae742fa8e1fd4fd74f8ca9330b396e0a108664010954311dd9a4ea
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -763,14 +763,14 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce
 F src/printf.c 6a87534ebfb9e5346011191b1f3a7ebc457f5938c7e4feeea478ecf53f6a41b2
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
+F src/resolve.c b7e50d31c5dd15dd129b30943212a77d24ee62058d6c60cfc6ed5de9570f2063
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
 F src/shell.c.in 40de636c1d90fb8a9ca7f49dc8f50d930f1b60736e73aca5eb37c4c7d0e47f9d
-F src/sqlite.h.in f07bff4225a1244efd604a0ffef81ed69f29d3dbaed7e22f906f26229ba3ca9e
+F src/sqlite.h.in 4929a538ee660b23d774dd691f444f91b4aff2c05d6e98acce607ee7ae93e833
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h 8eac0c901803fc1fca0faa0ad28492c3b5f38c436d2f594c03308d9b955dbecb
+F src/sqliteInt.h aa6ed92b72969d97def6c346dfc6b5194276f44f43c332184e7d8861a7abb0d0
 F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2211,11 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
-R d8caee9c6c8e089bfb48a8d01fa2ad93
-T *branch * ordered-set-agg
-T *sym-ordered-set-agg *
-T -sym-trunk *
+P ef9777890001ba0122d3add799795e118fd87243f42731ab84d4748b67605647
+R c9bceafb5aeb2174b63055fb2107e4ab
 U drh
-Z b43c798c432268071337348d4788bafe
+Z db0202ce7a6cda8a39ef6c63d39130ef
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2d0708c71b..81673bd417 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef9777890001ba0122d3add799795e118fd87243f42731ab84d4748b67605647
+317d901429303340290334dbe7680a36339df0a50b586e3f71b6c5e5eba6d411
diff --git a/src/main.c b/src/main.c
index 5d6212208e..ac08eea04f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1926,7 +1926,8 @@ int sqlite3CreateFunc(
   assert( SQLITE_FUNC_CONSTANT==SQLITE_DETERMINISTIC );
   assert( SQLITE_FUNC_DIRECT==SQLITE_DIRECTONLY );
   extraFlags = enc &  (SQLITE_DETERMINISTIC|SQLITE_DIRECTONLY|
-                       SQLITE_SUBTYPE|SQLITE_INNOCUOUS|SQLITE_RESULT_SUBTYPE);
+                       SQLITE_SUBTYPE|SQLITE_INNOCUOUS|
+                       SQLITE_RESULT_SUBTYPE|SQLITE_SELFORDER1);
   enc &= (SQLITE_FUNC_ENCMASK|SQLITE_ANY);
 
   /* The SQLITE_INNOCUOUS flag is the same bit as SQLITE_FUNC_UNSAFE.  But
diff --git a/src/parse.y b/src/parse.y
index efcde10e64..3db20e9acc 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1204,7 +1204,7 @@ expr(A) ::= idj(X) LP STAR RP. {
                       pFuncname);
     }
     pExpr = sqlite3ExprFunction(pParse, p, pFuncname, 0);
-    if( pExpr ) pExpr->iTable = 1;
+    if( pExpr ) pExpr->iColumn = 1;
     return pExpr;
   }
 }
diff --git a/src/resolve.c b/src/resolve.c
index b755cc8646..f448bc324a 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1292,6 +1292,10 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       else if( ExprHasProperty(pExpr, EP_WinFunc) || pExpr->pLeft ){
         is_agg = 1;
       }
+      if( pExpr->iColumn && (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
+        sqlite3ErrorMsg(pParse, "%#T() is not a ordered-set aggregate function",
+                        pExpr);
+      }
       sqlite3WalkExprList(pWalker, pList);
       if( is_agg ){
         if( pExpr->pLeft ){
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 810ccecc96..8e5e327c93 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5615,6 +5615,13 @@ int sqlite3_create_window_function(
 ** [sqlite3_result_subtype()] should avoid setting this property, as the
 ** purpose of this property is to disable certain optimizations that are
 ** incompatible with subtypes.
+**
+** [[SQLITE_SELFORDER1]] <dt>SQLITE_SELFORDER1</dt><dd>
+** The SQLITE_SELFORDER1 flag indicates that the function is an aggregate
+** that internally orders the values provided to the first argument.  The
+** ordered-set aggregate SQL notation can be used to invoke this function.
+** If the ordered-set aggregate notation is used on a function that lacks
+** this flag, then an error is raised.
 ** </dd>
 ** </dl>
 */
@@ -5623,6 +5630,7 @@ int sqlite3_create_window_function(
 #define SQLITE_SUBTYPE          0x000100000
 #define SQLITE_INNOCUOUS        0x000200000
 #define SQLITE_RESULT_SUBTYPE   0x001000000
+#define SQLITE_SELFORDER1       0x002000000
 
 /*
 ** CAPI3REF: Deprecated Functions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index dcadec78d7..b77f035e76 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3049,10 +3049,10 @@ struct Expr {
                          ** EP_Unlikely:  134217728 times likelihood
                          ** TK_IN: ephemeral table holding RHS
                          ** TK_SELECT_COLUMN: Number of columns on the LHS
-                         ** TK_SELECT: 1st register of result vector
-                         ** TK_FUNCTION: Uses ordered-set aggregate syntax */
+                         ** TK_SELECT: 1st register of result vector */
   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.
                          ** TK_VARIABLE: variable number (always >= 1).
+                         ** TK_FUNCTION: Uses ordered-set aggregate syntax
                          ** TK_SELECT_COLUMN: column of the result vector */
   i16 iAgg;              /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
   union {

From 41155d888583f4eeda24144cf6e4c317b07dd082 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 10:52:20 +0000
Subject: [PATCH 16/50] Fix to the quicksort algorithm in the percentile
 extension.

FossilOrigin-Name: 54313f74b24c46f1afa1ff082ef569fa46938527095be358015e7047e17702ac
---
 ext/misc/percentile.c |  7 ++++++-
 manifest              | 14 +++++++-------
 manifest.uuid         |  2 +-
 test/percentile.test  |  6 +++++-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 3e619db69e..718be80da6 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -292,7 +292,12 @@ static void sortDoubles(double *a, int n){
 
   if( n<2 ) return;
   if( n>5 ){
-    rPivot = (a[0] + a[n/2] + a[n-1])/3.0;
+    double x[3];
+    x[0]= a[0];
+    x[1] = a[n/2];
+    x[2] = a[n-1];
+    sortDoubles(x,3);
+    rPivot = x[1];
   }else{
     rPivot = a[n/2];
   }
diff --git a/manifest b/manifest
index 1eec821886..ce1c028952 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Include\spercentile()\sand\smerge()\sin\sthe\sfuzzcheck\stest\sutility.
-D 2024-08-31T19:24:17.689
+C Fix\sto\sthe\squicksort\salgorithm\sin\sthe\spercentile\sextension.
+D 2024-09-01T10:52:20.432
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c ea1ff3561374c520193d5c3b3c86a40d922a9f0c2b48ae784d6cd9490093bd9d
+F ext/misc/percentile.c c5ddb86314a0648c510de54a7290b939225b128925d98b02859c47d98f9ec282
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test 96b941965a5e5dff7c7d0d31c099385324897a692a300a4c4370b2fb760e7dd0
+F test/percentile.test 5c5b622035d5e2e9a23e8462b2f59f9f9364e736f3ddfb0ffe294b1854f9caad
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3fe0a852978f3f1218e37a58f0d3b54016d4116a3301aa32efa7c4c12c767755
-R fe4924b06f0c2e628905b36a4804a9df
+P d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
+R 8b4bddb09aaccc6a2b060f365f91dbd1
 U drh
-Z f104fe8dff33191117d210e31173232d
+Z 1fbd72dda73eb1323c7b4878ebf0259d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a1cdbd5ba6..67c2b6b886 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
+54313f74b24c46f1afa1ff082ef569fa46938527095be358015e7047e17702ac
diff --git a/test/percentile.test b/test/percentile.test
index 14e40714b0..cef3835957 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -358,6 +358,10 @@ do_execsql_test percentile-5.1 {
   Emma   Z  2319.99  699.1    1104.3225  1509.545  1914.7675  2319.99
 }
 
-
+# Fuzzer find.
+do_execsql_test percentile-6.0 {
+  WITH RECURSIVE c(n) AS (VALUES(1) UNION ALL SELECT n+1 FROM c WHERE n<12)
+  SELECT median(iif(n%2,0.1,1.0)) FROM c;
+} 0.55
 
 finish_test

From c97ad9b4e156d5551d68d3964babc1841647ffb6 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 18:54:31 +0000
Subject: [PATCH 17/50] Improved sort function in the percentile extension.

FossilOrigin-Name: 9f84e8d59bcda642e732565e840f6a880a01b2fc65af2651248f6a8a6e1cb65a
---
 ext/misc/percentile.c | 66 ++++++++++++++++++++++---------------------
 manifest              | 12 ++++----
 manifest.uuid         |  2 +-
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 718be80da6..e0ce576339 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -271,6 +271,11 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
   }
 }
 
+/*
+** Interchange two doubles.
+*/
+#define SWAP_DOUBLE(X,Y)  {double ttt=(X);(X)=(Y);(Y)=ttt;}
+
 /*
 ** Sort an array of doubles.
 **
@@ -283,49 +288,44 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
 **    (2)  To avoid the function call to the comparison routine for each
 **         comparison.
 */
-static void sortDoubles(double *a, int n){
-  int iLt;       /* Entries with index less than iLt are less than rPivot */
-  int iGt;       /* Entries with index iGt or more are greater than rPivot */
+static void percentSort(double *a, unsigned int n){
+  int iLt;  /* Entries before a[iLt] are less than rPivot */
+  int iGt;  /* Entries at or after a[iGt] are greater than rPivot */
   int i;         /* Loop counter */
   double rPivot; /* The pivot value */
-  double rTmp;   /* Temporary used to swap two values */
-
-  if( n<2 ) return;
-  if( n>5 ){
-    double x[3];
-    x[0]= a[0];
-    x[1] = a[n/2];
-    x[2] = a[n-1];
-    sortDoubles(x,3);
-    rPivot = x[1];
-  }else{
-    rPivot = a[n/2];
+  
+  assert( n>=2 );
+  if( a[0]>a[n-1] ){
+    SWAP_DOUBLE(a[0],a[n-1])
   }
-  iLt = i = 0;
-  iGt = n;
-  while( i<iGt ){
+  if( n==2 ) return;
+  iGt = n-1;
+  i = n/2;
+  if( a[0]>a[i] ){
+    SWAP_DOUBLE(a[0],a[i])
+  }else if( a[i]>a[iGt] ){
+    SWAP_DOUBLE(a[i],a[iGt])
+  }
+  if( n==3 ) return;
+  rPivot = a[i];
+  iLt = i = 1;
+  do{
     if( a[i]<rPivot ){
-      if( i>iLt ){
-        rTmp = a[i];
-        a[i] = a[iLt];
-        a[iLt] = rTmp;
-      }
+      if( i>iLt ) SWAP_DOUBLE(a[i],a[iLt])
       iLt++;
       i++;
     }else if( a[i]>rPivot ){
       do{
         iGt--;
       }while( iGt>i && a[iGt]>rPivot );
-      rTmp = a[i];
-      a[i] = a[iGt];
-      a[iGt] = rTmp;
+      SWAP_DOUBLE(a[i],a[iGt])
     }else{
       i++;
     }
-  }
-  if( iLt>=2 ) sortDoubles(a, iLt);
-  if( n-iGt>=2 ) sortDoubles(a+iGt, n-iGt);
-
+  }while( i<iGt );
+  if( iLt>=2 ) percentSort(a, iLt);
+  if( n-iGt>=2 ) percentSort(a+iGt, n-iGt);
+    
 /* Uncomment for testing */
 #if 0
   for(i=0; i<n-1; i++){
@@ -366,7 +366,8 @@ static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
     return;
   }
   if( p->bSorted==0 ){
-    sortDoubles(p->a, p->nUsed);
+    assert( p->nUsed>1 );
+    percentSort(p->a, p->nUsed);
     p->bSorted = 1;
   }else{
     percentAssertSorted(p);
@@ -398,7 +399,8 @@ static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
   if( p->a==0 ) return;
   if( p->nUsed ){
     if( p->bSorted==0 ){
-      sortDoubles(p->a, p->nUsed);
+      assert( p->nUsed>1 );
+      percentSort(p->a, p->nUsed);
       p->bSorted = 1;
     }else{
       percentAssertSorted(p);
diff --git a/manifest b/manifest
index ce1c028952..cec2fd4ce8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sto\sthe\squicksort\salgorithm\sin\sthe\spercentile\sextension.
-D 2024-09-01T10:52:20.432
+C Improved\ssort\sfunction\sin\sthe\spercentile\sextension.
+D 2024-09-01T18:54:31.153
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c c5ddb86314a0648c510de54a7290b939225b128925d98b02859c47d98f9ec282
+F ext/misc/percentile.c 4560a3a42bab3d867060bb7e80a15fd82f917a58c87739591f0a3d99f18754a8
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d1d0942a947803d45a1fd9068f3518cf412178b6b9bafcb82db44c52d5820c11
-R 8b4bddb09aaccc6a2b060f365f91dbd1
+P 54313f74b24c46f1afa1ff082ef569fa46938527095be358015e7047e17702ac
+R b41846f3df9dc87b92ce32e03786ab20
 U drh
-Z 1fbd72dda73eb1323c7b4878ebf0259d
+Z 1672856efafeb853be5cf9a4114de044
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 67c2b6b886..888095dab4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54313f74b24c46f1afa1ff082ef569fa46938527095be358015e7047e17702ac
+9f84e8d59bcda642e732565e840f6a880a01b2fc65af2651248f6a8a6e1cb65a

From 7aa01a0ffc3197551d19178797d3d6c5356f2996 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 19:19:26 +0000
Subject: [PATCH 18/50] No prepare-time penality for ordered-set aggregates for
 applications that do not use them.

FossilOrigin-Name: e070c16d2183312e416ff6af770346041e4d3836c4db2c9ea6049f63fb0eaa07
---
 manifest        | 18 +++++++++---------
 manifest.uuid   |  2 +-
 src/parse.y     | 18 +++++++++++++-----
 src/resolve.c   |  4 ----
 src/sqlite.h.in |  6 +++---
 src/sqliteInt.h |  1 -
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/manifest b/manifest
index 7827fc9c59..575b14e652 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfixes\sfrom\strunk\sinto\sthe\sordere-set-agg\sbranch.
-D 2024-09-01T18:57:52.231
+C No\sprepare-time\spenality\sfor\sordered-set\saggregates\sfor\sapplications\sthat\ndo\snot\suse\sthem.
+D 2024-09-01T19:19:26.665
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y 93b0f932dbae742fa8e1fd4fd74f8ca9330b396e0a108664010954311dd9a4ea
+F src/parse.y ee8ed7b79a4b855e803efd9494f634eb9365aa0e0f84e436414eb2e0e20ce874
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -763,14 +763,14 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce
 F src/printf.c 6a87534ebfb9e5346011191b1f3a7ebc457f5938c7e4feeea478ecf53f6a41b2
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c b7e50d31c5dd15dd129b30943212a77d24ee62058d6c60cfc6ed5de9570f2063
+F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
 F src/shell.c.in 40de636c1d90fb8a9ca7f49dc8f50d930f1b60736e73aca5eb37c4c7d0e47f9d
-F src/sqlite.h.in 4929a538ee660b23d774dd691f444f91b4aff2c05d6e98acce607ee7ae93e833
+F src/sqlite.h.in f703fff052233db19a269cfda8ff6648d91dfa3159652ec4d8b211445f70c159
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
-F src/sqliteInt.h aa6ed92b72969d97def6c346dfc6b5194276f44f43c332184e7d8861a7abb0d0
+F src/sqliteInt.h 889cd632f4386bbd8619b166abb7d25f1c8ce6514e90cb7f22f63bd530fc6107
 F src/sqliteLimit.h 6878ab64bdeb8c24a1d762d45635e34b96da21132179023338c93f820eee6728
 F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 317d901429303340290334dbe7680a36339df0a50b586e3f71b6c5e5eba6d411 9f84e8d59bcda642e732565e840f6a880a01b2fc65af2651248f6a8a6e1cb65a
-R 5acc7ba4dfcfa66be05e9be878c8ce45
+P 7528ddcfdf155116353266e00e6408c526e29f04cb00ca2d9e84b105329b17c0
+R d3f3c0474c71bd75891856c6ee9d7573
 U drh
-Z 02d4f1f356aa5a390460fc145367b9bc
+Z 9be7e64939656f5720b58c58cd9e6ba2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1f6e329c93..5ee39e884b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7528ddcfdf155116353266e00e6408c526e29f04cb00ca2d9e84b105329b17c0
+e070c16d2183312e416ff6af770346041e4d3836c4db2c9ea6049f63fb0eaa07
diff --git a/src/parse.y b/src/parse.y
index 3db20e9acc..c126c815d6 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1199,12 +1199,20 @@ expr(A) ::= idj(X) LP STAR RP. {
       }
       sqlite3ExprListDelete(pParse->db, pOrig);
     }
-    if( isDistinct==SF_Distinct ){
-      sqlite3ErrorMsg(pParse, "DISTINCT not allows on ordered-set aggregate %T()",
-                      pFuncname);
-    }
     pExpr = sqlite3ExprFunction(pParse, p, pFuncname, 0);
-    if( pExpr ) pExpr->iColumn = 1;
+    if( pParse->nErr==0 ){
+      FuncDef *pDef;
+      u8 enc = ENC(pParse->db);
+      assert( pExpr!=0 );  /* Because otherwise pParse->nErr would not be zero */
+      assert( p!=0 );      /* Because otherwise pParse->nErr would not be zero */
+      pDef = sqlite3FindFunction(pParse->db, pExpr->u.zToken, p->nExpr, enc, 0);
+      if( pDef==0 || (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
+        sqlite3ErrorMsg(pParse, "%#T() is not an ordered-set aggregate", pExpr);
+      }else if( isDistinct==SF_Distinct ){
+        sqlite3ErrorMsg(pParse, "DISTINCT not allows on ordered-set aggregate %T()",
+                        pFuncname);
+      }
+    }
     return pExpr;
   }
 }
diff --git a/src/resolve.c b/src/resolve.c
index f448bc324a..b755cc8646 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1292,10 +1292,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       else if( ExprHasProperty(pExpr, EP_WinFunc) || pExpr->pLeft ){
         is_agg = 1;
       }
-      if( pExpr->iColumn && (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
-        sqlite3ErrorMsg(pParse, "%#T() is not a ordered-set aggregate function",
-                        pExpr);
-      }
       sqlite3WalkExprList(pWalker, pList);
       if( is_agg ){
         if( pExpr->pLeft ){
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 8e5e327c93..c1f1c1c368 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5619,9 +5619,9 @@ int sqlite3_create_window_function(
 ** [[SQLITE_SELFORDER1]] <dt>SQLITE_SELFORDER1</dt><dd>
 ** The SQLITE_SELFORDER1 flag indicates that the function is an aggregate
 ** that internally orders the values provided to the first argument.  The
-** ordered-set aggregate SQL notation can be used to invoke this function.
-** If the ordered-set aggregate notation is used on a function that lacks
-** this flag, then an error is raised.
+** ordered-set aggregate SQL notation with a single ORDER BY term can be
+** used to invoke this function.  If the ordered-set aggregate notation is
+** used on a function that lacks this flag, then an error is raised.
 ** </dd>
 ** </dl>
 */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index b77f035e76..0dab59f7a4 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3052,7 +3052,6 @@ struct Expr {
                          ** TK_SELECT: 1st register of result vector */
   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.
                          ** TK_VARIABLE: variable number (always >= 1).
-                         ** TK_FUNCTION: Uses ordered-set aggregate syntax
                          ** TK_SELECT_COLUMN: column of the result vector */
   i16 iAgg;              /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
   union {

From ca447020ae7dc06f4e5c7430fac3327e96115af9 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 20:24:24 +0000
Subject: [PATCH 19/50] Implement percentile_cont() and percentile_disc().

FossilOrigin-Name: b1a93f67d6b21df6fe3247c9333fead61dd425574f66ea3eb06b80c2b06f616a
---
 ext/misc/percentile.c | 85 ++++++++++++++++++++++++++++++-------------
 manifest              | 14 +++----
 manifest.uuid         |  2 +-
 test/percentile.test  | 18 ++++++---
 4 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index cafc55fead..1b6ff0b591 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -105,8 +105,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* The following object is the session context for a single percentile()
-** function.  We have to remember all input Y values until the very end.
+/* The following object is the group context for a single percentile()
+** aggregate.  Remember all input Y values until the very end.
 ** Those values are accumulated in the Percentile.a[] array.
 */
 typedef struct Percentile Percentile;
@@ -115,10 +115,26 @@ struct Percentile {
   unsigned nUsed;      /* Number of slots actually used in a[] */
   char bSorted;        /* True if a[] is already in sorted order */
   char bKeepSorted;    /* True if advantageous to keep a[] sorted */
-  double rPct;         /* 1.0 more than the value for P */
+  char bPctValid;      /* True if rPct is valid */
+  double rPct;         /* Fraction.  0.0 to 1.0 */
   double *a;           /* Array of Y values */
 };
 
+/* Details of each function in the percentile family */
+typedef struct PercentileFunc PercentileFunc;
+struct PercentileFunc {
+  const char *zName;   /* Function name */
+  char nArg;           /* Number of arguments */
+  char mxFrac;         /* Maximum value of the "fraction" input */
+  char bDiscrete;      /* True for percentile_disc() */
+};
+static const PercentileFunc aPercentFunc[] = {
+  { "median",           1,   1, 0 },
+  { "percentile",       2, 100, 0 },
+  { "percentile_cont",  2,   1, 0 },
+  { "percentile_disc",  2,   1, 1 },
+};
+
 /*
 ** Return TRUE if the input floating-point number is an infinity.
 */
@@ -192,15 +208,21 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
 
   if( argc==1 ){
     /* Requirement 13:  median(Y) is the same as percentile(Y,50). */
-    rPct = 50.0;
+    rPct = 0.5;
   }else{
     /* Requirement 3:  P must be a number between 0 and 100 */
+    PercentileFunc *pFunc = (PercentileFunc*)sqlite3_user_data(pCtx);
     eType = sqlite3_value_numeric_type(argv[1]);
-    rPct = sqlite3_value_double(argv[1]);
+    rPct = sqlite3_value_double(argv[1])/(double)pFunc->mxFrac;
     if( (eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT)
-     || rPct<0.0 || rPct>100.0 ){
-       sqlite3_result_error(pCtx, "2nd argument to percentile() is not "
-                           "a number between 0.0 and 100.0", -1);
+     || rPct<0.0 || rPct>1.0
+    ){
+      char *zMsg;
+      zMsg = sqlite3_mprintf("the fraction argument to %s()"
+                             " is not between 0.0 and %.1f",
+                             pFunc->zName, (double)pFunc->mxFrac);
+      sqlite3_result_error(pCtx, zMsg, -1);
+      sqlite3_free(zMsg);
       return;
     }
   }
@@ -211,11 +233,17 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
 
   /* Remember the P value.  Throw an error if the P value is different
   ** from any prior row, per Requirement (2). */
-  if( p->rPct==0.0 ){
-    p->rPct = rPct+1.0;
-  }else if( !percentSameValue(p->rPct,rPct+1.0) ){
-    sqlite3_result_error(pCtx, "2nd argument to percentile() is not the "
-                               "same for all input rows", -1);
+  if( !p->bPctValid ){
+    p->rPct = rPct;
+    p->bPctValid = 1;
+  }else if( !percentSameValue(p->rPct,rPct) ){
+    PercentileFunc *pFunc = (PercentileFunc*)sqlite3_user_data(pCtx);
+    char *zMsg;
+    zMsg = sqlite3_mprintf("the fraction argument to %s()"
+                           " is not the same for all input rows",
+                           pFunc->zName);
+    sqlite3_result_error(pCtx, zMsg, -1);
+    sqlite3_free(zMsg);
     return;
   }
 
@@ -391,6 +419,7 @@ static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
 */
 static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
   Percentile *p;
+  PercentileFunc *pFunc = (PercentileFunc*)sqlite3_user_data(pCtx);
   unsigned i1, i2;
   double v1, v2;
   double ix, vx;
@@ -405,12 +434,16 @@ static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
     }else{
       percentAssertSorted(p);
     }
-    ix = (p->rPct-1.0)*(p->nUsed-1)*0.01;
+    ix = p->rPct*(p->nUsed-1);
     i1 = (unsigned)ix;
-    i2 = ix==(double)i1 || i1==p->nUsed-1 ? i1 : i1+1;
-    v1 = p->a[i1];
-    v2 = p->a[i2];
-    vx = v1 + (v2-v1)*(ix-i1);
+    if( pFunc->bDiscrete ){
+      vx = p->a[i1];
+    }else{
+      i2 = ix==(double)i1 || i1==p->nUsed-1 ? i1 : i1+1;
+      v1 = p->a[i1];
+      v2 = p->a[i2];
+      vx = v1 + (v2-v1)*(ix-i1);
+    }
     sqlite3_result_double(pCtx, vx);
   }
   if( bIsFinal ){
@@ -436,19 +469,21 @@ int sqlite3_percentile_init(
   const sqlite3_api_routines *pApi
 ){
   int rc = SQLITE_OK;
+  int i;
 #ifdef SQLITE_STATIC_PERCENTILE
   (void)pApi;      /* Unused parameter */
 #else
   SQLITE_EXTENSION_INIT2(pApi);
 #endif
   (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_window_function(db, "percentile", 2, 
-          SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_SELFORDER1, 0,
-          percentStep, percentFinal, percentValue, percentInverse, 0);
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_window_function(db, "median", 1, 
-          SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_SELFORDER1, 0,
-          percentStep, percentFinal, percentValue, percentInverse, 0);
+  for(i=0; i<sizeof(aPercentFunc)/sizeof(aPercentFunc[0]); i++){
+    rc = sqlite3_create_window_function(db,
+            aPercentFunc[i].zName,
+            aPercentFunc[i].nArg,
+            SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_SELFORDER1,
+            (void*)&aPercentFunc[i],
+            percentStep, percentFinal, percentValue, percentInverse, 0);
+    if( rc ) break;
   }
   return rc;
 }
diff --git a/manifest b/manifest
index 575b14e652..72c50d4947 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C No\sprepare-time\spenality\sfor\sordered-set\saggregates\sfor\sapplications\sthat\ndo\snot\suse\sthem.
-D 2024-09-01T19:19:26.665
+C Implement\spercentile_cont()\sand\spercentile_disc().
+D 2024-09-01T20:24:24.177
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 98f7aab3607f6295b1c3168f763224e9de01a11c9c5c4cdd10f48418b89b52b4
+F ext/misc/percentile.c 76b29311319b6875ac6deb377c8338f651feeb5f929552994d18e3f0ffe6790d
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test 5c5b622035d5e2e9a23e8462b2f59f9f9364e736f3ddfb0ffe294b1854f9caad
+F test/percentile.test 827b3916a6db87d0521341cb828d0101a10de265e49c43503bbdb56e661f865f
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7528ddcfdf155116353266e00e6408c526e29f04cb00ca2d9e84b105329b17c0
-R d3f3c0474c71bd75891856c6ee9d7573
+P e070c16d2183312e416ff6af770346041e4d3836c4db2c9ea6049f63fb0eaa07
+R ed42ef3fb6a6b57f98420c8f5c685fd3
 U drh
-Z 9be7e64939656f5720b58c58cd9e6ba2
+Z a8f5cefc04272da03f15e22958022f9e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5ee39e884b..8048ca7545 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e070c16d2183312e416ff6af770346041e4d3836c4db2c9ea6049f63fb0eaa07
+b1a93f67d6b21df6fe3247c9333fead61dd425574f66ea3eb06b80c2b06f616a
diff --git a/test/percentile.test b/test/percentile.test
index cef3835957..3207aea096 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -68,7 +68,7 @@ do_test percentile-1.4 {
 } {0 4.4}
 do_test percentile-1.5 {
   catchsql {SELECT round(percentile(x, 15+0.1*rowid),1) FROM t1}
-} {1 {2nd argument to percentile() is not the same for all input rows}}
+} {1 {the fraction argument to percentile() is not the same for all input rows}}
 
 # Input values in a random order
 #
@@ -105,22 +105,28 @@ do_test percentile-1.9 {
 #
 do_test percentile-1.10 {
   catchsql {SELECT percentile(x,null) FROM t1}
-} {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
+} {1 {the fraction argument to percentile() is not between 0.0 and 100.0}}
 do_test percentile-1.11 {
   catchsql {SELECT percentile(x,'fifty') FROM t1}
-} {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
+} {1 {the fraction argument to percentile() is not between 0.0 and 100.0}}
 do_test percentile-1.12 {
   catchsql {SELECT percentile(x,x'3530') FROM t1}
-} {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
+} {1 {the fraction argument to percentile() is not between 0.0 and 100.0}}
 
 # Second argument is out of range
 #
 do_test percentile-1.13 {
   catchsql {SELECT percentile(x,-0.0000001) FROM t1}
-} {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
+} {1 {the fraction argument to percentile() is not between 0.0 and 100.0}}
 do_test percentile-1.14 {
   catchsql {SELECT percentile(x,100.0000001) FROM t1}
-} {1 {2nd argument to percentile() is not a number between 0.0 and 100.0}}
+} {1 {the fraction argument to percentile() is not between 0.0 and 100.0}}
+do_test percentile-1.14.2 {
+  catchsql {SELECT percentile_cont(x,1.0000001) FROM t1}
+} {1 {the fraction argument to percentile_cont() is not between 0.0 and 1.0}}
+do_test percentile-1.14.3 {
+  catchsql {SELECT percentile_disc(x,1.0000001) FROM t1}
+} {1 {the fraction argument to percentile_disc() is not between 0.0 and 1.0}}
 
 # First argument is not NULL and is not NUMERIC
 #

From 1c30df3598e03605906fe127817dc3e42dc27460 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 23:27:34 +0000
Subject: [PATCH 20/50] The WITHIN GROUP (ORDER BY ...) syntax is now a
 compile-time option: SQLITE_ENABLE_ORDERED_SET_FUNCS.  There is no increment
 in the code size if the option is omitted.

FossilOrigin-Name: c9367e2532d653738af27c4d92810eb648a9e12f72d7223017c87cb0dddc6804
---
 manifest                 | 24 ++++++++++++------------
 manifest.uuid            |  2 +-
 src/ctime.c              |  3 +++
 src/parse.y              | 11 +++++++++--
 src/sqlite.h.in          |  4 +++-
 src/test_config.c        |  8 ++++++++
 test/testrunner_data.tcl |  1 +
 tool/mkctimec.tcl        |  1 +
 tool/mkkeywordhash.c     |  7 ++++++-
 9 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 72c50d4947..89cd7c0795 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Implement\spercentile_cont()\sand\spercentile_disc().
-D 2024-09-01T20:24:24.177
+C The\sWITHIN\sGROUP\s(ORDER\sBY\s...)\ssyntax\sis\snow\sa\scompile-time\soption:\nSQLITE_ENABLE_ORDERED_SET_FUNCS.\s\sThere\sis\sno\sincrement\sin\sthe\scode\ssize\nif\sthe\soption\sis\somitted.
+D 2024-09-01T23:27:34.356
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -710,7 +710,7 @@ F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b
 F src/build.c 3a1840d9d171ce2d24f4c1f7acda7266ab796c664290c1acba65ff98ce2bd01e
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 64e4b1227b4ed123146f0aa2989131d1fbd9b927b11e80c9d58c6a68f9cd5ce3
+F src/ctime.c c130635c99df1fcd1212613230d4f326ca3adb6982bfdb92e224a831e188b0ce
 F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y ee8ed7b79a4b855e803efd9494f634eb9365aa0e0f84e436414eb2e0e20ce874
+F src/parse.y 228eaa370f4467106af4b2065cd7d1e1382e7f248070dc67e86d1fc8975ad69e
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -767,7 +767,7 @@ F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
 F src/shell.c.in 40de636c1d90fb8a9ca7f49dc8f50d930f1b60736e73aca5eb37c4c7d0e47f9d
-F src/sqlite.h.in f703fff052233db19a269cfda8ff6648d91dfa3159652ec4d8b211445f70c159
+F src/sqlite.h.in 42c48f4f78a18580de594208ac48fda6ea8f0c68810e059ae502329017c55f98
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 F src/sqliteInt.h 889cd632f4386bbd8619b166abb7d25f1c8ce6514e90cb7f22f63bd530fc6107
@@ -790,7 +790,7 @@ F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d97
 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6
 F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5
 F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5
-F src/test_config.c 46eaf39842cace9d540aeefb50fe24dd3204a622893a97952cbb49c20b2f8b21
+F src/test_config.c 31846473de1803736ab0e4423424173357b6c3e2bc8cae93fea6d01a4c441c04
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383
 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
@@ -1715,7 +1715,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
 F test/testrunner.tcl 662af46f1f0a41eb197f17583698853dd130ff3d47cf136dd519c3aecd9a9d7d
-F test/testrunner_data.tcl f1cbff53fe42087cac3d43ca02f9574bd212c842307442e2b6fff2183f5ccbfe
+F test/testrunner_data.tcl 0cdd2d71d2fef65ef1ef72709336cbb229580f12e8deb3cbc55c3af971256ccc
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2131,8 +2131,8 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 48ca8eefa9e615cb9057ce6485b9c9ae5801381f24690d7d60b3b2dc8e6b7457 x
-F tool/mkkeywordhash.c d2d7369faacb45e7ec089ccbc2fd48e2fcab3d62d3533648c4017d5df1abd37d
+F tool/mkctimec.tcl 643f691143c4ad45d8c743538d1303fa5e78f9b164db4eef6a4e818fa34b5518 x
+F tool/mkkeywordhash.c 2f1c62255f5866d85e8d39efaa9ef88216cac4bd3d20e0b971c4bac42c79adc4
 F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
 F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e070c16d2183312e416ff6af770346041e4d3836c4db2c9ea6049f63fb0eaa07
-R ed42ef3fb6a6b57f98420c8f5c685fd3
+P b1a93f67d6b21df6fe3247c9333fead61dd425574f66ea3eb06b80c2b06f616a
+R 53af1edd1d9feb68bdee109d972b107c
 U drh
-Z a8f5cefc04272da03f15e22958022f9e
+Z 4ca68917083632dff3be94c09fa2e867
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8048ca7545..735947519d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b1a93f67d6b21df6fe3247c9333fead61dd425574f66ea3eb06b80c2b06f616a
+c9367e2532d653738af27c4d92810eb648a9e12f72d7223017c87cb0dddc6804
diff --git a/src/ctime.c b/src/ctime.c
index 0ffe2a5bdf..486b29a26b 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -295,6 +295,9 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
   "ENABLE_OFFSET_SQL_FUNC",
 #endif
+#ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+  "ENABLE_ORDERED_SET_FUNCS",
+#endif
 #ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   "ENABLE_OVERSIZE_CELL_CHECK",
 #endif
diff --git a/src/parse.y b/src/parse.y
index c126c815d6..72c1b66cfa 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -255,7 +255,7 @@ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,A,Y);}
   EACH END EXCLUSIVE EXPLAIN FAIL FOR
   IGNORE IMMEDIATE INITIALLY INSTEAD LIKE_KW MATCH NO PLAN
   QUERY KEY OF OFFSET PRAGMA RAISE RECURSIVE RELEASE REPLACE RESTRICT ROW ROWS
-  ROLLBACK SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL WITH WITHIN WITHOUT
+  ROLLBACK SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL WITH WITHOUT
   NULLS FIRST LAST
 %ifdef SQLITE_OMIT_COMPOUND_SELECT
   EXCEPT INTERSECT UNION
@@ -264,6 +264,9 @@ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,A,Y);}
   CURRENT FOLLOWING PARTITION PRECEDING RANGE UNBOUNDED
   EXCLUDE GROUPS OTHERS TIES
 %endif SQLITE_OMIT_WINDOWFUNC
+%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+  WITHIN
+%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
 %ifndef SQLITE_OMIT_GENERATED_COLUMNS
   GENERATED ALWAYS
 %endif
@@ -1179,6 +1182,7 @@ expr(A) ::= idj(X) LP STAR RP. {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
 }
 
+%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
 %include {
   /* Generate an expression node that represents an ordered-set aggregate function */
   static Expr *sqlite3ExprAddOrderedsetFunction(
@@ -1219,6 +1223,7 @@ expr(A) ::= idj(X) LP STAR RP. {
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP. {
   A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
 }
+%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
 
 %ifndef SQLITE_OMIT_WINDOWFUNC
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP filter_over(Z). {
@@ -1234,13 +1239,15 @@ expr(A) ::= idj(X) LP STAR RP filter_over(Z). {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
   sqlite3WindowAttach(pParse, A, Z);
 }
+%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP
             filter_over(Z). {
   A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
   sqlite3WindowAttach(pParse, A, Z);
 }
+%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
 
-%endif
+%endif SQLITE_OMIT_WINDOWFUNC
 
 term(A) ::= CTIME_KW(OP). {
   A = sqlite3ExprFunction(pParse, 0, &OP, 0);
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index c1f1c1c368..b211299e6d 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5621,7 +5621,9 @@ int sqlite3_create_window_function(
 ** that internally orders the values provided to the first argument.  The
 ** ordered-set aggregate SQL notation with a single ORDER BY term can be
 ** used to invoke this function.  If the ordered-set aggregate notation is
-** used on a function that lacks this flag, then an error is raised.
+** used on a function that lacks this flag, then an error is raised. Note
+** that the ordered-set aggregate syntax is only available if SQLite is
+** built using the -DSQLITE_ENABLE_ORDERED_SET_FUNCS compile-time option.
 ** </dd>
 ** </dl>
 */
diff --git a/src/test_config.c b/src/test_config.c
index 58de5a4625..c4f06b7cac 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -341,6 +341,14 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "columnmetadata", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_ENABLE_ORDEREDSETFUNC
+  Tcl_SetVar2(interp, "sqlite_options", "ordered_set_funcs", "1",
+              TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "ordered_set_funcs", "0",
+              TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   Tcl_SetVar2(interp, "sqlite_options", "oversize_cell_check", "1",
               TCL_GLOBAL_ONLY);
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index 71a42ab404..10f9262563 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -95,6 +95,7 @@ namespace eval trd {
   #
   set build(All-Debug) {
     --enable-debug --enable-all
+    -DSQLITE_ENABLE_ORDERED_SET_FUNCS
   }
   set build(All-O0) {
     -O0 --enable-all
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 7ca664a37e..90360cb204 100755
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -159,6 +159,7 @@ set boolean_defnil_options {
   SQLITE_ENABLE_MULTIPLEX
   SQLITE_ENABLE_NORMALIZE
   SQLITE_ENABLE_NULL_TRIM
+  SQLITE_ENABLE_ORDERED_SET_FUNCS
   SQLITE_ENABLE_OFFSET_SQL_FUNC
   SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   SQLITE_ENABLE_PREUPDATE_HOOK
diff --git a/tool/mkkeywordhash.c b/tool/mkkeywordhash.c
index d4d04da6e3..bf4b0c32d3 100644
--- a/tool/mkkeywordhash.c
+++ b/tool/mkkeywordhash.c
@@ -164,6 +164,11 @@ struct Keyword {
 #else
 #  define RETURNING  0x00400000
 #endif
+#ifndef SQLITE_ENABLE_ORDERED_SET_FUNCS
+#  define ORDERSET   0
+#else
+#  define ORDERSET   0x00800000
+#endif
 
 
 /*
@@ -316,7 +321,7 @@ static Keyword aKeywordTable[] = {
   { "WHERE",            "TK_WHERE",        ALWAYS,           10     },
   { "WINDOW",           "TK_WINDOW",       WINDOWFUNC,       3      },
   { "WITH",             "TK_WITH",         CTE,              4      },
-  { "WITHIN",           "TK_WITHIN",       ALWAYS,           1      },
+  { "WITHIN",           "TK_WITHIN",       ORDERSET,         1      },
   { "WITHOUT",          "TK_WITHOUT",      ALWAYS,           1      },
 };
 

From b9a6e42a5513e12f633f9f1d895c3f575c056544 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 23:47:20 +0000
Subject: [PATCH 21/50] Improved documentation of recent enhancements to the
 percentile extension.

FossilOrigin-Name: 51e7b4c9cf19a5986432a76c5fd30cef715c170a403d7b4304a8c5888c445a91
---
 ext/misc/percentile.c | 40 +++++++++++++++++++++++++++++-----------
 manifest              | 12 ++++++------
 manifest.uuid         |  2 +-
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 1b6ff0b591..d23055fd75 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -11,7 +11,7 @@
 ******************************************************************************
 **
 ** This file contains code to implement the percentile(Y,P) SQL function
-** as described below:
+** and similar as described below:
 **
 **   (1)  The percentile(Y,P) function is an aggregate function taking
 **        exactly two arguments.
@@ -60,27 +60,45 @@
 **
 **  (13)  A separate median(Y) function is the equivalent percentile(Y,50).
 **
-**  (14)  Both median() and percentile(Y,P) can be used as window functions.
+**  (14)  A separate percentile_cont(Y,P) function is equivalent to
+**        percentile(Y,P/100.0).  In other words, the fraction value in
+**        the second argument is in the range of 0 to 1 instead of 0 to 100.
+**
+**  (15)  A separate percentile_disc(Y,P) function is like
+**        percentile_cont(Y,P) except that instead of returning the weighted
+**        average of the nearest two input values, it returns the next lower
+**        value.  So the percentile_disc(Y,P) will always return a value
+**        that was one of the inputs.
+**
+**  (16)  All of median(), percentile(Y,P), percentile_cont(Y,P) and
+**        percentile_disc(Y,P) can be used as window functions.
 **
 ** Differences from standard SQL:
 **
-**  *  The percentile(X,P) function is equivalent to the following in
+**  *  The percentile_cont(X,P) function is equivalent to the following in
 **     standard SQL:
 **
-**         (percentile(P/100.0) WITHIN GROUP (ORDER BY X))
+**         (percentile_cont(P) WITHIN GROUP (ORDER BY X))
 **
-**     The SQLite syntax is much more compact.  Note also that the
-**     range of the P argument is 0..100 in SQLite, but 0..1 in the
-**     standard.
+**     The SQLite syntax is much more compact.  The standard SQL syntax
+**     is also supported if SQLite is compiled with the
+**     -DSQLITE_ENABLE_ORDERED_SET_FUNCS option.
 **
-**  *  No merge(X) function exists in the standard.  Application developers
+**  *  No median(X) function exists in the SQL standard.  App developers
 **     are expected to write "percentile_cont(0.5)WITHIN GROUP(ORDER BY X)".
 **
+**  *  No percentile(Y,P) function exists in the SQL standard.  Instead of
+**     percential(Y,P), developers must write this:
+**     "percentile_cont(P/100.0) WITHIN GROUP (ORDER BY Y)".  Note that
+**     the fraction parameter to percentile() goes from 0 to 100 whereas
+**     the fraction parameter in SQL standard percentile_cont() goes from
+**     0 to 1.
+**
 ** Implementation notes as of 2024-08-31:
 **
-**  *  The regular aggregate-function versions of the merge() and percentile(),
-**     routines work by accumulating all values in an array of doubles, then
-**     sorting that array using a quicksort before computing the answer. Thus
+**  *  The regular aggregate-function versions of these routines work
+**     by accumulating all values in an array of doubles, then sorting
+**     that array using quicksort before computing the answer. Thus
 **     the runtime is O(NlogN) where N is the number of rows of input.
 **
 **  *  For the window-function versions of these routines, the array of
diff --git a/manifest b/manifest
index 89cd7c0795..5341d83a69 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sWITHIN\sGROUP\s(ORDER\sBY\s...)\ssyntax\sis\snow\sa\scompile-time\soption:\nSQLITE_ENABLE_ORDERED_SET_FUNCS.\s\sThere\sis\sno\sincrement\sin\sthe\scode\ssize\nif\sthe\soption\sis\somitted.
-D 2024-09-01T23:27:34.356
+C Improved\sdocumentation\sof\srecent\senhancements\sto\sthe\spercentile\sextension.
+D 2024-09-01T23:47:20.435
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 76b29311319b6875ac6deb377c8338f651feeb5f929552994d18e3f0ffe6790d
+F ext/misc/percentile.c 0a7d3e9ddff3aeb9ce4cd6b8a27291ace34d5976689f4f7481e28666cd1ccf63
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b1a93f67d6b21df6fe3247c9333fead61dd425574f66ea3eb06b80c2b06f616a
-R 53af1edd1d9feb68bdee109d972b107c
+P c9367e2532d653738af27c4d92810eb648a9e12f72d7223017c87cb0dddc6804
+R ac4c49def40924a4942d4d05a7a36f9f
 U drh
-Z 4ca68917083632dff3be94c09fa2e867
+Z d0ae9c1e72197b37292ce151522509d5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 735947519d..1c1cbd597d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9367e2532d653738af27c4d92810eb648a9e12f72d7223017c87cb0dddc6804
+51e7b4c9cf19a5986432a76c5fd30cef715c170a403d7b4304a8c5888c445a91

From b5df31d15f085ff0b22f61b1a3cc730c49c19d8b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 1 Sep 2024 23:56:14 +0000
Subject: [PATCH 22/50] More internal documentation improvements.

FossilOrigin-Name: 8b91b74931c36e1955ef933a07d8ec40c8b54c882efe7084d179168867c5244f
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/parse.y   | 20 ++++++++++++++++++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 5341d83a69..52744e92b1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdocumentation\sof\srecent\senhancements\sto\sthe\spercentile\sextension.
-D 2024-09-01T23:47:20.435
+C More\sinternal\sdocumentation\simprovements.
+D 2024-09-01T23:56:14.104
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y 228eaa370f4467106af4b2065cd7d1e1382e7f248070dc67e86d1fc8975ad69e
+F src/parse.y 5a15f76ee1e215cd1db9741685f94768a94fbe8b4b160c6211cd996194b996d2
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c9367e2532d653738af27c4d92810eb648a9e12f72d7223017c87cb0dddc6804
-R ac4c49def40924a4942d4d05a7a36f9f
+P 51e7b4c9cf19a5986432a76c5fd30cef715c170a403d7b4304a8c5888c445a91
+R bfc4e614787c482acd37bc365c967d35
 U drh
-Z d0ae9c1e72197b37292ce151522509d5
+Z 004df0b11de984975db126394a0a1e5e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1c1cbd597d..384da0da19 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51e7b4c9cf19a5986432a76c5fd30cef715c170a403d7b4304a8c5888c445a91
+8b91b74931c36e1955ef933a07d8ec40c8b54c882efe7084d179168867c5244f
diff --git a/src/parse.y b/src/parse.y
index 72c1b66cfa..138a41d300 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1184,7 +1184,23 @@ expr(A) ::= idj(X) LP STAR RP. {
 
 %ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
 %include {
-  /* Generate an expression node that represents an ordered-set aggregate function */
+  /* Generate an expression node that represents an ordered-set aggregate function.
+  **
+  ** SQLite does not do anything special to evaluate ordered-set aggregates.  The
+  ** aggregate function itself is expected to do any required ordering on its own.
+  ** This is just syntactic sugar.
+  **
+  ** This syntax:        percentile(f) WITHIN GROUP ( ORDER BY y )
+  **
+  ** Is equivalent to:   percentile(y,f)
+  **
+  ** The purpose of this function is to generate an Expr node from the first syntax
+  ** into a TK_FUNCTION node that looks like it came from the second syntax.
+  **
+  ** Only functions that have the SQLITE_SELFORDER1 perperty are allowed to do this
+  ** transformation.  Because DISTINCT is not allowed in the ordered-set aggregate
+  ** syntax, an error is raised if DISTINCT is used.
+  */
   static Expr *sqlite3ExprAddOrderedsetFunction(
     Parse *pParse,         /* Parsing context */
     Token *pFuncname,      /* Name of the function */
@@ -1213,7 +1229,7 @@ expr(A) ::= idj(X) LP STAR RP. {
       if( pDef==0 || (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
         sqlite3ErrorMsg(pParse, "%#T() is not an ordered-set aggregate", pExpr);
       }else if( isDistinct==SF_Distinct ){
-        sqlite3ErrorMsg(pParse, "DISTINCT not allows on ordered-set aggregate %T()",
+        sqlite3ErrorMsg(pParse, "DISTINCT not allowed on ordered-set aggregate %T()",
                         pFuncname);
       }
     }

From a955ec806ae3ca4e881894f3d74d3f1d64997856 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 2 Sep 2024 09:40:37 +0000
Subject: [PATCH 23/50] Change the name of the enabling compile-time macro to
 SQLITE_ENABLE_ORDERED_SET_AGGREGATES.

FossilOrigin-Name: 3b1cdddf8339cc339ec74cd8be2bfa42e62b500048a444eb9e5d9817bc4702ae
---
 ext/misc/percentile.c    |  2 +-
 manifest                 | 26 +++++++++++++-------------
 manifest.uuid            |  2 +-
 src/ctime.c              |  4 ++--
 src/parse.y              | 12 ++++++------
 src/sqlite.h.in          |  2 +-
 src/test_config.c        |  8 ++++++++
 test/testrunner_data.tcl |  2 +-
 tool/mkctimec.tcl        |  2 +-
 tool/mkkeywordhash.c     |  2 +-
 10 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index d23055fd75..3d9ad89193 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -82,7 +82,7 @@
 **
 **     The SQLite syntax is much more compact.  The standard SQL syntax
 **     is also supported if SQLite is compiled with the
-**     -DSQLITE_ENABLE_ORDERED_SET_FUNCS option.
+**     -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES option.
 **
 **  *  No median(X) function exists in the SQL standard.  App developers
 **     are expected to write "percentile_cont(0.5)WITHIN GROUP(ORDER BY X)".
diff --git a/manifest b/manifest
index 52744e92b1..302b6b6106 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sinternal\sdocumentation\simprovements.
-D 2024-09-01T23:56:14.104
+C Change\sthe\sname\sof\sthe\senabling\scompile-time\smacro\sto\nSQLITE_ENABLE_ORDERED_SET_AGGREGATES.
+D 2024-09-02T09:40:37.769
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 0a7d3e9ddff3aeb9ce4cd6b8a27291ace34d5976689f4f7481e28666cd1ccf63
+F ext/misc/percentile.c b9b06a30882fb588161db3d558fb0bc48a0ae84b2b76471baf19e48b438cfe77
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -710,7 +710,7 @@ F src/btreeInt.h 98aadb6dcb77b012cab2574d6a728fad56b337fc946839b9898c4b4c969e30b
 F src/build.c 3a1840d9d171ce2d24f4c1f7acda7266ab796c664290c1acba65ff98ce2bd01e
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c c130635c99df1fcd1212613230d4f326ca3adb6982bfdb92e224a831e188b0ce
+F src/ctime.c b224d3db0f28c4a5f1407c50107a0a8133bd244ff3c7f6f8cedeb896a8cf1b64
 F src/date.c 89ce1ff20512a7fa5070ba6e7dd5c171148ca7d580955795bf97c79c2456144a
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 73362c0df0f40ad5523a6f5501224959d0976757b511299bf892313e79d14f5c
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y 5a15f76ee1e215cd1db9741685f94768a94fbe8b4b160c6211cd996194b996d2
+F src/parse.y c168522b4929c84e11577d61f8f61c998127a5032203e8c386cb8621fe158ee0
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -767,7 +767,7 @@ F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
 F src/shell.c.in 40de636c1d90fb8a9ca7f49dc8f50d930f1b60736e73aca5eb37c4c7d0e47f9d
-F src/sqlite.h.in 42c48f4f78a18580de594208ac48fda6ea8f0c68810e059ae502329017c55f98
+F src/sqlite.h.in 77f55bd1978a04a14db211732f0a609077cf60ba4ccf9baf39988f508945419c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
 F src/sqliteInt.h 889cd632f4386bbd8619b166abb7d25f1c8ce6514e90cb7f22f63bd530fc6107
@@ -790,7 +790,7 @@ F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d97
 F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6
 F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5
 F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5
-F src/test_config.c 31846473de1803736ab0e4423424173357b6c3e2bc8cae93fea6d01a4c441c04
+F src/test_config.c 345b8e383f71cecc36d0fa05f2f06639c254b188f98101c3c97749df43037086
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383
 F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
@@ -1715,7 +1715,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
 F test/testrunner.tcl 662af46f1f0a41eb197f17583698853dd130ff3d47cf136dd519c3aecd9a9d7d
-F test/testrunner_data.tcl 0cdd2d71d2fef65ef1ef72709336cbb229580f12e8deb3cbc55c3af971256ccc
+F test/testrunner_data.tcl d64e69aba227492fc459eb0f6a88c3e1b252bd9323847b7e8bcf5e1faa358714
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2131,8 +2131,8 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 643f691143c4ad45d8c743538d1303fa5e78f9b164db4eef6a4e818fa34b5518 x
-F tool/mkkeywordhash.c 2f1c62255f5866d85e8d39efaa9ef88216cac4bd3d20e0b971c4bac42c79adc4
+F tool/mkctimec.tcl e3af51acc2ef92062fe6d622de010a27a34b497258a248dada04388b916c61c6 x
+F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
 F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
 F tool/mkopcodeh.tcl 2b4e6967a670ef21bf53a164964c35c6163277d002a4c6f56fa231d68c88d023
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 51e7b4c9cf19a5986432a76c5fd30cef715c170a403d7b4304a8c5888c445a91
-R bfc4e614787c482acd37bc365c967d35
+P 8b91b74931c36e1955ef933a07d8ec40c8b54c882efe7084d179168867c5244f
+R 87b66cdb033da0a37b7575ccb3ae22cb
 U drh
-Z 004df0b11de984975db126394a0a1e5e
+Z d0d824ad26699ac4f4773aa97bb7dc96
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 384da0da19..ef8888d75b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b91b74931c36e1955ef933a07d8ec40c8b54c882efe7084d179168867c5244f
+3b1cdddf8339cc339ec74cd8be2bfa42e62b500048a444eb9e5d9817bc4702ae
diff --git a/src/ctime.c b/src/ctime.c
index 486b29a26b..fe7849fec7 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -295,8 +295,8 @@ static const char * const sqlite3azCompileOpt[] = {
 #ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
   "ENABLE_OFFSET_SQL_FUNC",
 #endif
-#ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
-  "ENABLE_ORDERED_SET_FUNCS",
+#ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
+  "ENABLE_ORDERED_SET_AGGREGATES",
 #endif
 #ifdef SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   "ENABLE_OVERSIZE_CELL_CHECK",
diff --git a/src/parse.y b/src/parse.y
index 138a41d300..8ff2326202 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -264,9 +264,9 @@ columnname(A) ::= nm(A) typetoken(Y). {sqlite3AddColumn(pParse,A,Y);}
   CURRENT FOLLOWING PARTITION PRECEDING RANGE UNBOUNDED
   EXCLUDE GROUPS OTHERS TIES
 %endif SQLITE_OMIT_WINDOWFUNC
-%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+%ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
   WITHIN
-%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
+%endif SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 %ifndef SQLITE_OMIT_GENERATED_COLUMNS
   GENERATED ALWAYS
 %endif
@@ -1182,7 +1182,7 @@ expr(A) ::= idj(X) LP STAR RP. {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
 }
 
-%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+%ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 %include {
   /* Generate an expression node that represents an ordered-set aggregate function.
   **
@@ -1239,7 +1239,7 @@ expr(A) ::= idj(X) LP STAR RP. {
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP. {
   A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
 }
-%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
+%endif SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 
 %ifndef SQLITE_OMIT_WINDOWFUNC
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP filter_over(Z). {
@@ -1255,13 +1255,13 @@ expr(A) ::= idj(X) LP STAR RP filter_over(Z). {
   A = sqlite3ExprFunction(pParse, 0, &X, 0);
   sqlite3WindowAttach(pParse, A, Z);
 }
-%ifdef SQLITE_ENABLE_ORDERED_SET_FUNCS
+%ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 expr(A) ::= idj(X) LP distinct(D) exprlist(Y) RP WITHIN GROUP LP ORDER BY expr(E) RP
             filter_over(Z). {
   A = sqlite3ExprAddOrderedsetFunction(pParse, &X, D, Y, E);
   sqlite3WindowAttach(pParse, A, Z);
 }
-%endif SQLITE_ENABLE_ORDERED_SET_FUNCS
+%endif SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 
 %endif SQLITE_OMIT_WINDOWFUNC
 
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index b211299e6d..5546793c94 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5623,7 +5623,7 @@ int sqlite3_create_window_function(
 ** used to invoke this function.  If the ordered-set aggregate notation is
 ** used on a function that lacks this flag, then an error is raised. Note
 ** that the ordered-set aggregate syntax is only available if SQLite is
-** built using the -DSQLITE_ENABLE_ORDERED_SET_FUNCS compile-time option.
+** built using the -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES compile-time option.
 ** </dd>
 ** </dl>
 */
diff --git a/src/test_config.c b/src/test_config.c
index c4f06b7cac..49527861a4 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -189,6 +189,14 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "offset_sql_func","0",TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
+  Tcl_SetVar2(interp, "sqlite_options",
+                      "ordered_set_aggregates","1",TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options",
+                      "ordered_set_aggregates","0",TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
   Tcl_SetVar2(interp, "sqlite_options", "preupdate", "1", TCL_GLOBAL_ONLY);
 #else
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index 10f9262563..f9a23063cb 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -95,7 +95,7 @@ namespace eval trd {
   #
   set build(All-Debug) {
     --enable-debug --enable-all
-    -DSQLITE_ENABLE_ORDERED_SET_FUNCS
+    -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES
   }
   set build(All-O0) {
     -O0 --enable-all
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 90360cb204..a7e897a596 100755
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -159,7 +159,7 @@ set boolean_defnil_options {
   SQLITE_ENABLE_MULTIPLEX
   SQLITE_ENABLE_NORMALIZE
   SQLITE_ENABLE_NULL_TRIM
-  SQLITE_ENABLE_ORDERED_SET_FUNCS
+  SQLITE_ENABLE_ORDERED_SET_AGGREGATES
   SQLITE_ENABLE_OFFSET_SQL_FUNC
   SQLITE_ENABLE_OVERSIZE_CELL_CHECK
   SQLITE_ENABLE_PREUPDATE_HOOK
diff --git a/tool/mkkeywordhash.c b/tool/mkkeywordhash.c
index bf4b0c32d3..188c0a29ac 100644
--- a/tool/mkkeywordhash.c
+++ b/tool/mkkeywordhash.c
@@ -164,7 +164,7 @@ struct Keyword {
 #else
 #  define RETURNING  0x00400000
 #endif
-#ifndef SQLITE_ENABLE_ORDERED_SET_FUNCS
+#ifndef SQLITE_ENABLE_ORDERED_SET_AGGREGATES
 #  define ORDERSET   0
 #else
 #  define ORDERSET   0x00800000

From d281889ac82f420768007bc947939c1232a6a7c5 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 2 Sep 2024 11:17:04 +0000
Subject: [PATCH 24/50] Improved error messages on percentile functions.  More
 tests cases for percentile and for ordered-set aggregates.

FossilOrigin-Name: e1bca168e70335fa2f9537632fd16e374c566a564fab4974c0b8f61cb63d08ce
---
 ext/misc/percentile.c |  45 +++--
 manifest              |  16 +-
 manifest.uuid         |   2 +-
 src/parse.y           |   2 +-
 test/percentile.test  | 383 +++++++++++++++++++++++++++++++++---------
 5 files changed, 342 insertions(+), 106 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 3d9ad89193..320d7a5301 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -213,6 +213,28 @@ static int percentBinarySearch(Percentile *p, double y, int bExact){
   return iFirst;
 }
 
+/*
+** Generate an error for a percentile function.
+**
+** The error format string must have exactly one occurrance of "%%s()"
+** (with two '%' characters).  That substring will be replaced by the name
+** of the function.
+*/
+static void percentError(sqlite3_context *pCtx, const char *zFormat, ...){
+  PercentileFunc *pFunc = (PercentileFunc*)sqlite3_user_data(pCtx);
+  char *zMsg1;
+  char *zMsg2;
+  va_list ap;
+
+  va_start(ap, zFormat);
+  zMsg1 = sqlite3_vmprintf(zFormat, ap);
+  va_end(ap);
+  zMsg2 = sqlite3_mprintf(zMsg1, pFunc->zName);
+  sqlite3_result_error(pCtx, zMsg2, -1);
+  sqlite3_free(zMsg1);
+  sqlite3_free(zMsg2);
+}
+
 /*
 ** The "step" function for percentile(Y,P) is called once for each
 ** input row.
@@ -235,12 +257,9 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
     if( (eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT)
      || rPct<0.0 || rPct>1.0
     ){
-      char *zMsg;
-      zMsg = sqlite3_mprintf("the fraction argument to %s()"
-                             " is not between 0.0 and %.1f",
-                             pFunc->zName, (double)pFunc->mxFrac);
-      sqlite3_result_error(pCtx, zMsg, -1);
-      sqlite3_free(zMsg);
+      percentError(pCtx, "the fraction argument to %%s()"
+                        " is not between 0.0 and %.1f",
+                        (double)pFunc->mxFrac);
       return;
     }
   }
@@ -255,13 +274,8 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
     p->rPct = rPct;
     p->bPctValid = 1;
   }else if( !percentSameValue(p->rPct,rPct) ){
-    PercentileFunc *pFunc = (PercentileFunc*)sqlite3_user_data(pCtx);
-    char *zMsg;
-    zMsg = sqlite3_mprintf("the fraction argument to %s()"
-                           " is not the same for all input rows",
-                           pFunc->zName);
-    sqlite3_result_error(pCtx, zMsg, -1);
-    sqlite3_free(zMsg);
+    percentError(pCtx, "the fraction argument to %%s()"
+                      " is not the same for all input rows");
     return;
   }
 
@@ -272,15 +286,14 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
   /* If not NULL, then Y must be numeric.  Otherwise throw an error.
   ** Requirement 4 */
   if( eType!=SQLITE_INTEGER && eType!=SQLITE_FLOAT ){
-    sqlite3_result_error(pCtx, "1st argument to percentile() is not "
-                               "numeric", -1);
+    percentError(pCtx, "input to %%s() is not numeric");
     return;
   }
 
   /* Throw an error if the Y value is infinity or NaN */
   y = sqlite3_value_double(argv[0]);
   if( percentIsInfinity(y) ){
-    sqlite3_result_error(pCtx, "Inf input to percentile()", -1);
+    percentError(pCtx, "Inf input to %%s()");
     return;
   }
 
diff --git a/manifest b/manifest
index 302b6b6106..c3fb0bad7a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\senabling\scompile-time\smacro\sto\nSQLITE_ENABLE_ORDERED_SET_AGGREGATES.
-D 2024-09-02T09:40:37.769
+C Improved\serror\smessages\son\spercentile\sfunctions.\s\sMore\stests\scases\sfor\npercentile\sand\sfor\sordered-set\saggregates.
+D 2024-09-02T11:17:04.726
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c b9b06a30882fb588161db3d558fb0bc48a0ae84b2b76471baf19e48b438cfe77
+F ext/misc/percentile.c 4e333fc78d2a7b9cf362e29f30fa3f486cdab9e69fbc9aa0f680399683aa22f7
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -754,7 +754,7 @@ F src/os_win.c 6ff43bac175bd9ed79e7c0f96840b139f2f51d01689a638fd05128becf94908a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c b08600ebf0db90b6d1e9b8b6577c6fa3877cbe1a100bd0b2899e4c6e9adad4b3
 F src/pager.h 4b1140d691860de0be1347474c51fee07d5420bd7f802d38cbab8ea4ab9f538a
-F src/parse.y c168522b4929c84e11577d61f8f61c998127a5032203e8c386cb8621fe158ee0
+F src/parse.y a7a8d42eeff01d267444ddb476029b0b1726fb70ae3d77984140f17ad02e2d61
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 49516ad7718a3626f28f710fa7448ef1fce3c07fd169acbb4817341950264319
@@ -1517,7 +1517,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463
-F test/percentile.test 827b3916a6db87d0521341cb828d0101a10de265e49c43503bbdb56e661f865f
+F test/percentile.test 52ba89d6ee6b65f770972b67dace358bab7cdbd532803d3db157845268e789cd
 F test/permutations.test 405542f1d659942994a6b38a9e024cf5cfd23eaa68c806aeb24a72d7c9186e80
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 11cb9310c42f921918f7f563e3c0b6e70f9f9c3a6a1cf12af8fccb6c574f3882
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8b91b74931c36e1955ef933a07d8ec40c8b54c882efe7084d179168867c5244f
-R 87b66cdb033da0a37b7575ccb3ae22cb
+P 3b1cdddf8339cc339ec74cd8be2bfa42e62b500048a444eb9e5d9817bc4702ae
+R a80c34160df19b1603ad0e7833a0d0c3
 U drh
-Z d0d824ad26699ac4f4773aa97bb7dc96
+Z baa1dd0d6096edf0ada0dc3da2ddafed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ef8888d75b..126ce65bc7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b1cdddf8339cc339ec74cd8be2bfa42e62b500048a444eb9e5d9817bc4702ae
+e1bca168e70335fa2f9537632fd16e374c566a564fab4974c0b8f61cb63d08ce
diff --git a/src/parse.y b/src/parse.y
index 8ff2326202..a6a5e046db 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1225,7 +1225,7 @@ expr(A) ::= idj(X) LP STAR RP. {
       u8 enc = ENC(pParse->db);
       assert( pExpr!=0 );  /* Because otherwise pParse->nErr would not be zero */
       assert( p!=0 );      /* Because otherwise pParse->nErr would not be zero */
-      pDef = sqlite3FindFunction(pParse->db, pExpr->u.zToken, p->nExpr, enc, 0);
+      pDef = sqlite3FindFunction(pParse->db, pExpr->u.zToken, -2, enc, 0);
       if( pDef==0 || (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
         sqlite3ErrorMsg(pParse, "%#T() is not an ordered-set aggregate", pExpr);
       }else if( isDistinct==SF_Distinct ){
diff --git a/test/percentile.test b/test/percentile.test
index 3207aea096..a6a29da34e 100644
--- a/test/percentile.test
+++ b/test/percentile.test
@@ -9,7 +9,8 @@
 #
 #***********************************************************************
 # This file implements regression tests for SQLite library.  The
-# focus of this file is percentile.c extension
+# focus of this file is percentile.c extension.  This also tests
+# the SQLITE_ENABLE_ORDERED_SET_AGGREGATES compile-time option.
 #
 
 set testdir [file dirname $argv0]
@@ -25,50 +26,135 @@ do_test percentile-1.0 {
   }
   execsql {SELECT percentile(x,0) FROM t1}
 } {1.0}
-foreach {in out} {
-  100    11.0
-   50     8.0
-   12.5   4.0
-   15     4.4
-   20     5.2
-   80    11.0
-   89    11.0
+foreach {in out disc} {
+  100    11.0  11.0
+   50     8.0   8.0
+   12.5   4.0   4.0
+   15     4.4   4.0
+   20     5.2   4.0
+   80    11.0  11.0
+   89    11.0  11.0
 } {
-  do_test percentile-1.1.$in {
+  do_test percentile-1.1.$in.1 {
     execsql {SELECT percentile(x,$in) FROM t1}
   } $out
+  do_test percentile-1.1.$in.2 {
+    execsql {SELECT percentile_cont(x,$in*0.01) FROM t1}
+  } $out
+  do_test percentile-1.1.$in.3 {
+    execsql {SELECT percentile_disc(x,$in*0.01) FROM t1}
+  } $disc
+  if {$in==50} {
+    do_test percentile-1.1.$in.4 {
+      execsql {SELECT median(x) FROM t1}
+    } $out
+  }
+  ifcapable ordered_set_aggregates {
+    do_test percentile-1.1.$in.5 {
+      execsql {SELECT percentile($in)WITHIN GROUP(ORDER BY x) FROM t1}
+    } $out
+    do_test percentile-1.1.$in.6 {
+      execsql {SELECT percentile_cont($in*0.01) WITHIN GROUP(ORDER BY x)
+                 FROM t1}
+    } $out
+    do_test percentile-1.1.$in.7 {
+      execsql {SELECT percentile_disc($in*0.01) WITHIN GROUP(ORDER BY x)
+                 FROM t1}
+    } $disc
+    if {$in==50} {
+      do_test percentile-1.1.$in.8 {
+        execsql {SELECT median() WITHIN GROUP (ORDER BY x) FROM t1}
+      } $out
+    }
+  }
 }
 do_execsql_test percentile-1.1.median {
   SELECT median(x) FROM t1;
 } 8.0
+ifcapable ordered_set_aggregates {
+  do_execsql_test percentile-1.1.median {
+    SELECT median() WITHIN GROUP (ORDER BY x) FROM t1;
+  } 8.0
+  do_execsql_test percentile-1.1.distinct.1 {
+    SELECT median(DISTINCT x) FROM t1;
+  } 7.0
+  do_catchsql_test percentile-1.1.distinct.2 {
+    SELECT percentile(DISTINCT 50) WITHIN GROUP (ORDER BY x) FROM t1;
+  } {1 {DISTINCT not allowed on ordered-set aggregate percentile()}}
+} else {
+  do_catchsql_test percentile-1.1.median {
+    SELECT median() WITHIN GROUP (ORDER BY x) FROM t1;
+  } {1 {near "(": syntax error}}
+}
 
 # Add some NULL values.
 #
 do_test percentile-1.2 {
   execsql {INSERT INTO t1 VALUES(NULL),(NULL);}
 } {}
-foreach {in out} {
-  100    11.0
-   50     8.0
-   12.5   4.0
-   15     4.4
-   20     5.2
-   80    11.0
-   89    11.0
+foreach {in out disc} {
+  100    11.0  11.0
+   50     8.0   8.0
+   12.5   4.0   4.0
+   15     4.4   4.0
+   20     5.2   4.0
+   80    11.0  11.0
+   89    11.0  11.0
 } {
-  do_test percentile-1.3.$in {
+  do_test percentile-1.3.$in.1 {
     execsql {SELECT percentile(x,$in) FROM t1}
   } $out
+  do_test percentile-1.3.$in.2 {
+    execsql {SELECT percentile_cont(x,$in*0.01) FROM t1}
+  } $out
+  do_test percentile-1.3.$in.3 {
+    execsql {SELECT percentile_disc(x,$in*0.01) FROM t1}
+  } $disc
+  if {$in==50} {
+    do_test percentile-1.3.$in.4 {
+      execsql {SELECT median(x) FROM t1}
+    } $out
+  }
+  ifcapable ordered_set_aggregates {
+    do_test percentile-1.3.$in.5 {
+      execsql {SELECT percentile($in)WITHIN GROUP(ORDER BY x) FROM t1}
+    } $out
+    do_test percentile-1.3.$in.6 {
+      execsql {SELECT percentile_cont($in*0.01) WITHIN GROUP(ORDER BY x)
+                 FROM t1}
+    } $out
+    do_test percentile-1.3.$in.7 {
+      execsql {SELECT percentile_disc($in*0.01) WITHIN GROUP(ORDER BY x)
+                 FROM t1}
+    } $disc
+    if {$in==50} {
+      do_test percentile-1.3.$in.8 {
+        execsql {SELECT median() WITHIN GROUP (ORDER BY x) FROM t1}
+      } $out
+    }
+  }
 }
 
 # The second argument to percentile can change some, but not much.
 #
-do_test percentile-1.4 {
+do_test percentile-1.4.1 {
   catchsql {SELECT round(percentile(x, 15+0.000001*rowid),1) FROM t1}
 } {0 4.4}
-do_test percentile-1.5 {
-  catchsql {SELECT round(percentile(x, 15+0.1*rowid),1) FROM t1}
+do_test percentile-1.4.2 {
+  catchsql {SELECT round(percentile_cont(x,(15+0.000001*rowid)*0.01),1) FROM t1}
+} {0 4.4}
+do_test percentile-1.4.3 {
+  catchsql {SELECT percentile_disc(x, (15+0.000001*rowid)*0.01) FROM t1}
+} {0 4.0}
+do_test percentile-1.5.1 {
+  catchsql {SELECT percentile(x, 15+0.1*rowid) FROM t1}
 } {1 {the fraction argument to percentile() is not the same for all input rows}}
+do_test percentile-1.5.2 {
+  catchsql {SELECT percentile_cont(x, (15+0.1*rowid)*0.01) FROM t1}
+} {1 {the fraction argument to percentile_cont() is not the same for all input rows}}
+do_test percentile-1.5.3 {
+  catchsql {SELECT percentile_disc(x, (15+0.1*rowid)*0.01) FROM t1}
+} {1 {the fraction argument to percentile_disc() is not the same for all input rows}}
 
 # Input values in a random order
 #
@@ -78,28 +164,100 @@ do_test percentile-1.6 {
     INSERT INTO t2 SELECT x+0.0 FROM t1 ORDER BY random();
   }
 } {}
-foreach {in out} {
-  100    11.0
-   50     8.0
-   12.5   4.0
-   15     4.4
-   20     5.2
-   80    11.0
-   89    11.0
+foreach {in out disc} {
+  100    11.0  11.0
+   50     8.0   8.0
+   12.5   4.0   4.0
+   15     4.4   4.0
+   20     5.2   4.0
+   80    11.0  11.0
+   89    11.0  11.0
 } {
-  do_test percentile-1.7.$in {
+  do_test percentile-1.7.$in.1 {
     execsql {SELECT percentile(x,$in) FROM t2}
   } $out
+  do_test percentile-1.7.$in.2 {
+    execsql {SELECT percentile_cont(x,$in*0.01) FROM t2}
+  } $out
+  do_test percentile-1.7.$in.3 {
+    execsql {SELECT percentile_disc(x,$in*0.01) FROM t2}
+  } $disc
+  if {$in==50} {
+    do_test percentile-1.7.$in.4 {
+      execsql {SELECT median(x) FROM t2}
+    } $out
+  }
+  ifcapable ordered_set_aggregates {
+    do_test percentile-1.7.$in.5 {
+      execsql {SELECT percentile($in)WITHIN GROUP(ORDER BY x) FROM t2}
+    } $out
+    do_test percentile-1.7.$in.6 {
+      execsql {SELECT percentile_cont($in*0.01) WITHIN GROUP(ORDER BY x)
+                 FROM t2}
+    } $out
+    do_test percentile-1.7.$in.7 {
+      execsql {SELECT percentile_disc($in*0.01) WITHIN GROUP(ORDER BY x)
+                 FROM t2}
+    } $disc
+    if {$in==50} {
+      do_test percentile-1.7.$in.8 {
+        execsql {SELECT median() WITHIN GROUP (ORDER BY x) FROM t2}
+      } $out
+    }
+  }
 }
 
 # Wrong number of arguments
 #
-do_test percentile-1.8 {
+do_test percentile-1.8.1 {
   catchsql {SELECT percentile(x,0,1) FROM t1}
 } {1 {wrong number of arguments to function percentile()}}
-do_test percentile-1.9 {
+do_test percentile-1.8.2 {
+  catchsql {SELECT percentile_cont(x,0,1) FROM t1}
+} {1 {wrong number of arguments to function percentile_cont()}}
+do_test percentile-1.8.3 {
+  catchsql {SELECT percentile_disc(x,0,1) FROM t1}
+} {1 {wrong number of arguments to function percentile_disc()}}
+do_test percentile-1.8.4 {
+  catchsql {SELECT median(x,0) FROM t1}
+} {1 {wrong number of arguments to function median()}}
+ifcapable ordered_set_aggregates {
+  do_test percentile-1.8.5 {
+    catchsql {SELECT percentile(0,1) WITHIN GROUP(ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function percentile()}}
+  do_test percentile-1.8.2 {
+    catchsql {SELECT percentile_cont(0,1)WITHIN GROUP (ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function percentile_cont()}}
+  do_test percentile-1.8.3 {
+    catchsql {SELECT percentile_disc(0,1)WITHIN GROUP (ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function percentile_disc()}}
+  do_test percentile-1.8.4 {
+    catchsql {SELECT median(x) WITHIN GROUP (ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function median()}}
+}
+do_test percentile-1.9.1 {
   catchsql {SELECT percentile(x) FROM t1}
 } {1 {wrong number of arguments to function percentile()}}
+do_test percentile-1.9.2 {
+  catchsql {SELECT percentile_cont(x) FROM t1}
+} {1 {wrong number of arguments to function percentile_cont()}}
+do_test percentile-1.9.3 {
+  catchsql {SELECT percentile_disc(x) FROM t1}
+} {1 {wrong number of arguments to function percentile_disc()}}
+do_test percentile-1.9.4 {
+  catchsql {SELECT median() FROM t1}
+} {1 {wrong number of arguments to function median()}}
+ifcapable ordered_set_aggregates {
+  do_test percentile-1.9.5 {
+    catchsql {SELECT percentile() WITHIN GROUP(ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function percentile()}}
+  do_test percentile-1.9.6 {
+    catchsql {SELECT percentile_cont()WITHIN GROUP (ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function percentile_cont()}}
+  do_test percentile-1.9.7 {
+    catchsql {SELECT percentile_disc()WITHIN GROUP (ORDER BY x) FROM t1}
+  } {1 {wrong number of arguments to function percentile_disc()}}
+}
 
 # Second argument must be numeric
 #
@@ -130,13 +288,28 @@ do_test percentile-1.14.3 {
 
 # First argument is not NULL and is not NUMERIC
 #
-do_test percentile-1.15 {
+do_test percentile-1.15.1 {
   catchsql {
     BEGIN;
     UPDATE t1 SET x='50' WHERE x IS NULL;
     SELECT percentile(x, 50) FROM t1;
   }
-} {1 {1st argument to percentile() is not numeric}}
+} {1 {input to percentile() is not numeric}}
+do_test percentile-1.15.2 {
+  catchsql {
+    SELECT percentile_cont(x, 0.50) FROM t1;
+  }
+} {1 {input to percentile_cont() is not numeric}}
+do_test percentile-1.15.3 {
+  catchsql {
+    SELECT percentile_disc(x, 0.50) FROM t1;
+  }
+} {1 {input to percentile_disc() is not numeric}}
+do_test percentile-1.15.4 {
+  catchsql {
+    SELECT median(x) FROM t1;
+  }
+} {1 {input to median() is not numeric}}
 do_test percentile-1.16 {
   catchsql {
     ROLLBACK;
@@ -144,7 +317,7 @@ do_test percentile-1.16 {
     UPDATE t1 SET x=x'3530' WHERE x IS NULL;
     SELECT percentile(x, 50) FROM t1;
   }
-} {1 {1st argument to percentile() is not numeric}}
+} {1 {input to percentile() is not numeric}}
 do_test percentile-1.17 {
   catchsql {
     ROLLBACK;
@@ -172,7 +345,7 @@ do_test percentile-1.19 {
 
 # Infinity as an input
 #
-do_test percentile-1.20 {
+do_test percentile-1.20.1 {
   catchsql {
     DELETE FROM t1;
     INSERT INTO t1 SELECT x+0.0 FROM t2;
@@ -180,6 +353,43 @@ do_test percentile-1.20 {
     SELECT percentile(x,50) from t1;
   }
 } {1 {Inf input to percentile()}}
+do_test percentile-1.20.2 {
+  catchsql {
+    SELECT percentile_cont(x,0.50) from t1;
+  }
+} {1 {Inf input to percentile_cont()}}
+do_test percentile-1.20.3 {
+  catchsql {
+    SELECT percentile_disc(x,0.50) from t1;
+  }
+} {1 {Inf input to percentile_disc()}}
+do_test percentile-1.20.4 {
+  catchsql {
+    SELECT median(x) from t1;
+  }
+} {1 {Inf input to median()}}
+ifcapable ordered_set_aggregates {
+  do_test percentile-1.20.5 {
+    catchsql {
+      SELECT percentile(50) WITHIN GROUP (ORDER BY x) from t1;
+    }
+  } {1 {Inf input to percentile()}}
+  do_test percentile-1.20.6 {
+    catchsql {
+      SELECT percentile_cont(0.50) WITHIN GROUP (ORDER BY x) from t1;
+    }
+  } {1 {Inf input to percentile_cont()}}
+  do_test percentile-1.20.7 {
+    catchsql {
+      SELECT percentile_disc(0.50) WITHIN GROUP(ORDER BY X) from t1;
+    }
+  } {1 {Inf input to percentile_disc()}}
+  do_test percentile-1.20.8 {
+    catchsql {
+      SELECT median() WITHIN GROUP (ORDER BY x) from t1;
+    }
+  } {1 {Inf input to median()}}
+}
 do_test percentile-1.21 {
   catchsql {
     UPDATE t1 SET x=-1.0e300*1.0e300 WHERE rowid=5;
@@ -228,50 +438,63 @@ do_execsql_test percentile-3.0 {
                         (6, 'F', 'three', 0.0),
                         (7, 'G', 'one',   2.7);
 }
-do_execsql_test percentile-3.1 {
-SELECT a, b, c, d,
-       group_concat(b,'.') OVER W1 AS 'elements',
-       median(d) OVER W1 AS 'median'
-  FROM t1
- WINDOW W1 AS (ORDER BY c, a ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
+foreach {id oba expr} {
+  1 0 "median(d)"
+  2 0 "percentile(d,50)"
+  3 0 "percentile_cont(d,0.5)"
+  4 1 "median() WITHIN GROUP (ORDER BY d)"
+  5 1 "percentile(50) WITHIN GROUP (ORDER BY d)"
+  6 1 "percentile_cont(0.5) WITHIN GROUP (ORDER BY d)"
 } {
-  1  A  one    8.4   A.D       9.7   
-  4  D  one    11.0  A.D.G     8.4   
-  7  G  one    2.7   D.G.C     5.9   
-  3  C  three  5.9   G.C.F     2.7   
-  6  F  three  0.0   C.F.B     5.9   
-  2  B  two    7.1   F.B.E     7.1   
-  5  E  two    12.5  B.E       9.8   
-}
-do_execsql_test percentile-3.2 {
-SELECT a, b, c, d,
-       group_concat(b,'.') OVER W1 AS 'elements',
-       median(d) OVER W1 AS 'median'
-  FROM t1
- WINDOW W1 AS (ORDER BY c, a ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)
-} {
-  1  A  one    8.4   A.D            9.7   
-  4  D  one    11.0  A.D.G          8.4   
-  7  G  one    2.7   A.D.G.C        7.15  
-  3  C  three  5.9   A.D.G.C.F      5.9   
-  6  F  three  0.0   A.D.G.C.F.B    6.5   
-  2  B  two    7.1   A.D.G.C.F.B.E  7.1   
-  5  E  two    12.5  A.D.G.C.F.B.E  7.1   
-}
-do_execsql_test percentile-3.3 {
-SELECT a, b, c, d,
-       group_concat(b,'.') OVER W1 AS 'elements',
-       median(d) OVER W1 AS 'median'
-  FROM t1
- WINDOW W1 AS (ORDER BY c, a ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)
-} {
-  1  A  one    8.4   A.D.G.C.F.B.E  7.1   
-  4  D  one    11.0  A.D.G.C.F.B.E  7.1   
-  7  G  one    2.7   D.G.C.F.B.E    6.5   
-  3  C  three  5.9   G.C.F.B.E      5.9   
-  6  F  three  0.0   C.F.B.E        6.5   
-  2  B  two    7.1   F.B.E          7.1   
-  5  E  two    12.5  B.E            9.8   
+  if {$oba} {
+    ifcapable !ordered_set_aggregates break
+  }
+  set sql "SELECT a, b, c, d, \
+                  group_concat(b,'.') OVER w1 AS 'elements', \
+                  $expr OVER w1 AS 'median' \
+            FROM t1 \
+          WINDOW w1 AS (ORDER BY c, a ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)"
+  do_execsql_test percentile-3.$id.1 $sql {
+    1  A  one    8.4   A.D       9.7   
+    4  D  one    11.0  A.D.G     8.4   
+    7  G  one    2.7   D.G.C     5.9   
+    3  C  three  5.9   G.C.F     2.7   
+    6  F  three  0.0   C.F.B     5.9   
+    2  B  two    7.1   F.B.E     7.1   
+    5  E  two    12.5  B.E       9.8   
+  }
+
+  set sql "SELECT a, b, c, d, \
+                  group_concat(b,'.') OVER w1 AS 'elements', \
+                  $expr OVER w1 AS 'median' \
+            FROM t1 \
+           WINDOW w1 AS (ORDER BY c, a \
+               ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)"
+  do_execsql_test percentile-3.$id.2 $sql {
+    1  A  one    8.4   A.D            9.7   
+    4  D  one    11.0  A.D.G          8.4   
+    7  G  one    2.7   A.D.G.C        7.15  
+    3  C  three  5.9   A.D.G.C.F      5.9   
+    6  F  three  0.0   A.D.G.C.F.B    6.5   
+    2  B  two    7.1   A.D.G.C.F.B.E  7.1   
+    5  E  two    12.5  A.D.G.C.F.B.E  7.1   
+  }
+
+  set sql "SELECT a, b, c, d, \
+                  group_concat(b,'.') OVER w1 AS 'elements', \
+                  $expr OVER w1 AS 'median' \
+            FROM t1 \
+           WINDOW w1 AS (ORDER BY c, a \
+               ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)"
+  do_execsql_test percentile-3.$id.3 $sql {
+    1  A  one    8.4   A.D.G.C.F.B.E  7.1   
+    4  D  one    11.0  A.D.G.C.F.B.E  7.1   
+    7  G  one    2.7   D.G.C.F.B.E    6.5   
+    3  C  three  5.9   G.C.F.B.E      5.9   
+    6  F  three  0.0   C.F.B.E        6.5   
+    2  B  two    7.1   F.B.E          7.1   
+    5  E  two    12.5  B.E            9.8   
+  }
 }
 
 # Test case adapted from examples shown at

From da52f11250a4c9083800903545ff935533ab4ec8 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 2 Sep 2024 14:46:56 +0000
Subject: [PATCH 25/50] Remove some debug/test code from percentile.  Make the
 extension easier to statically link.

FossilOrigin-Name: 6e5f146e274b210749dd8923a2da56905eb098b5a66699ff9130e3e51b1ff662
---
 ext/misc/percentile.c | 25 ++++---------------------
 manifest              | 12 ++++++------
 manifest.uuid         |  2 +-
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 320d7a5301..2d0c578307 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -113,7 +113,9 @@
 **     often small.  The developers might revisit that decision later,
 **     should the need arise.
 */
-#ifdef SQLITE_STATIC_PERCENTILE
+#if defined(SQLITE3_H)
+  /* no-op */
+#elif defined(SQLITE_STATIC_PERCENTILE)
 #  include "sqlite3.h"
 #else
 #  include "sqlite3ext.h"
@@ -171,19 +173,6 @@ static int percentSameValue(double a, double b){
   return a>=-0.001 && a<=0.001;
 }
 
-#if 0
-/* Verify that the elements of the Percentile p are in fact sorted.
-** Used for testing and debugging only.
-*/
-static void percentAssertSorted(Percentile *p){
-  int i;
-  for(i=p->nUsed-2; i>=0 && p->a[i]<=p->a[i+1]; i--){}
-  assert( i<0 );
-}
-#else
-# define percentAssertSorted(X)
-#endif
-
 /*
 ** Search p (which must have p->bSorted) looking for an entry with
 ** value y.  Return the index of that entry.
@@ -317,7 +306,6 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
     p->a[p->nUsed++] = y;
   }else if( p->bKeepSorted ){
     int i;
-    percentAssertSorted(p);
     i = percentBinarySearch(p, y, 0);
     if( i<p->nUsed ){
       memmove(&p->a[i+1], &p->a[i], (p->nUsed-i)*sizeof(p->a[0]));
@@ -428,8 +416,6 @@ static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
     assert( p->nUsed>1 );
     percentSort(p->a, p->nUsed);
     p->bSorted = 1;
-  }else{
-    percentAssertSorted(p);
   }
   p->bKeepSorted = 1;
 
@@ -441,7 +427,6 @@ static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
       memmove(&p->a[i], &p->a[i+1], (p->nUsed - i)*sizeof(p->a[0]));
     }
   }
-  percentAssertSorted(p);
 }
 
 /*
@@ -462,8 +447,6 @@ static void percentCompute(sqlite3_context *pCtx, int bIsFinal){
       assert( p->nUsed>1 );
       percentSort(p->a, p->nUsed);
       p->bSorted = 1;
-    }else{
-      percentAssertSorted(p);
     }
     ix = p->rPct*(p->nUsed-1);
     i1 = (unsigned)ix;
@@ -501,7 +484,7 @@ int sqlite3_percentile_init(
 ){
   int rc = SQLITE_OK;
   int i;
-#ifdef SQLITE_STATIC_PERCENTILE
+#if defined(SQLITE3_H) || defined(SQLITE_STATIC_PERCENTILE)
   (void)pApi;      /* Unused parameter */
 #else
   SQLITE_EXTENSION_INIT2(pApi);
diff --git a/manifest b/manifest
index cce3a0815c..c08ccd5502 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\spercentile\sextension\sto\ssupport\spercentile_cont()\sand\npercentile_disc().\s\sAdd\ssupport\sfor\sordered-set\saggregate\snotation\sin\s\nthe\sparser\swhen\scompiling\swith\sSQLITE_ENABLE_ORDERED_SET_AGGREGATES.\s\sA\nnew\sfunction\sproperty\sSQLITE_SELFORDER1\smust\sappear\son\sany\saggregate\sfunction\nthat\swants\sto\stake\sadvantage\sof\sthe\sordered-set\saggregate\snotation.
-D 2024-09-02T12:07:37.155
+C Remove\ssome\sdebug/test\scode\sfrom\spercentile.\s\sMake\sthe\sextension\seasier\sto\nstatically\slink.
+D 2024-09-02T14:46:56.875
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 4e333fc78d2a7b9cf362e29f30fa3f486cdab9e69fbc9aa0f680399683aa22f7
+F ext/misc/percentile.c 519498f4b1da580c309f6101bad8ed75dae8b14b1cedeb9ed5674c5ba56dcfd8
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9f84e8d59bcda642e732565e840f6a880a01b2fc65af2651248f6a8a6e1cb65a e1bca168e70335fa2f9537632fd16e374c566a564fab4974c0b8f61cb63d08ce
-R a80c34160df19b1603ad0e7833a0d0c3
+P 557bd245ef24af15da1374762bbeb9b8b0241da06e604efdf00d567a9ed09216
+R ec683c52072c14116d879dab2762a8e0
 U drh
-Z bcaae55c6dbf3569256cb9e1e280cac1
+Z 2046e8e3b6b1593905ac362bd0920672
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dfe5de4fea..df5cc5da3d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-557bd245ef24af15da1374762bbeb9b8b0241da06e604efdf00d567a9ed09216
+6e5f146e274b210749dd8923a2da56905eb098b5a66699ff9130e3e51b1ff662

From ef7c692baf3be891a4f9c71a8e22f3c97a47877d Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 2 Sep 2024 17:27:10 +0000
Subject: [PATCH 26/50] Make the percential extension easier to incorporate as
 a built-in on Windows applications.

FossilOrigin-Name: 831e2be4117dc7f5113f66d3e484ca34e4405444ac7b0def12ee9a00608d40da
---
 ext/misc/percentile.c |  2 +-
 manifest              | 12 ++++++------
 manifest.uuid         |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 2d0c578307..e02fa6efd8 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -474,7 +474,7 @@ static void percentValue(sqlite3_context *pCtx){
   percentCompute(pCtx, 0);
 }
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(SQLITE3_H) && !defined(SQLITE_STATIC_PERCENTILE)
 __declspec(dllexport)
 #endif
 int sqlite3_percentile_init(
diff --git a/manifest b/manifest
index c08ccd5502..7c17707051 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sdebug/test\scode\sfrom\spercentile.\s\sMake\sthe\sextension\seasier\sto\nstatically\slink.
-D 2024-09-02T14:46:56.875
+C Make\sthe\spercential\sextension\seasier\sto\sincorporate\sas\sa\sbuilt-in\son\sWindows\napplications.
+D 2024-09-02T17:27:10.804
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -410,7 +410,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 519498f4b1da580c309f6101bad8ed75dae8b14b1cedeb9ed5674c5ba56dcfd8
+F ext/misc/percentile.c 2ab82e3ce7bbf22ede8c3e894b767281fbdb482d7b399c105b6f5646b41eb8a3
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 557bd245ef24af15da1374762bbeb9b8b0241da06e604efdf00d567a9ed09216
-R ec683c52072c14116d879dab2762a8e0
+P 6e5f146e274b210749dd8923a2da56905eb098b5a66699ff9130e3e51b1ff662
+R 517bb648cfa00dbab550ea88d8ac0979
 U drh
-Z 2046e8e3b6b1593905ac362bd0920672
+Z cfd9af88a034a1a9fa4582930541e35b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index df5cc5da3d..3837f5d0dd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e5f146e274b210749dd8923a2da56905eb098b5a66699ff9130e3e51b1ff662
+831e2be4117dc7f5113f66d3e484ca34e4405444ac7b0def12ee9a00608d40da

From 70989b6f5923a732b0caee881bd7c3ff8859e9c5 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Mon, 2 Sep 2024 18:41:59 +0000
Subject: [PATCH 27/50] Fix a technically undefined signed integer overflow in
 fts5.

FossilOrigin-Name: e6bec37ea1ca51e1d048941ce4c5211d8fc5c5e3556a1441f9c79b036843f9e3
---
 ext/fts5/fts5_index.c             |  2 +-
 ext/fts5/test/fts5integrity2.test | 56 +++++++++++++++++++++++++++++++
 manifest                          | 15 +++++----
 manifest.uuid                     |  2 +-
 4 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 ext/fts5/test/fts5integrity2.test

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 1f0a68d3eb..4363305a56 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -2185,7 +2185,7 @@ static void fts5SegIterNext_None(
 
   if( iOff<pIter->iEndofDoclist ){
     /* Next entry is on the current page */
-    i64 iDelta;
+    u64 iDelta;
     iOff += sqlite3Fts5GetVarint(&pIter->pLeaf->p[iOff], (u64*)&iDelta);
     pIter->iLeafOffset = iOff;
     pIter->iRowid += iDelta;
diff --git a/ext/fts5/test/fts5integrity2.test b/ext/fts5/test/fts5integrity2.test
new file mode 100644
index 0000000000..968be3bddf
--- /dev/null
+++ b/ext/fts5/test/fts5integrity2.test
@@ -0,0 +1,56 @@
+# 2024 September 3
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# This file contains tests focused on the integrity-check procedure.
+#
+
+source [file join [file dirname [info script]] fts5_common.tcl]
+set testprefix fts5integrity2
+
+# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
+do_execsql_test 2.0 {
+  CREATE VIRTUAL TABLE t2 USING fts5(a, detail='none');
+  BEGIN;
+    INSERT INTO t2(rowid, a) VALUES(-1, 'hello world');
+    INSERT INTO t2(rowid, a) VALUES(9223372036854775807, 'hello world');
+  COMMIT;
+}
+
+do_execsql_test 2.1 {
+  SELECT rowid FROM t2('hello AND world');
+} {-1 9223372036854775807}
+
+#-------------------------------------------------------------------------
+do_execsql_test 2.0 {
+  CREATE VIRTUAL TABLE t1 USING fts5(a, detail='none');
+  CREATE TABLE r1(r);
+  
+  WITH c(x) AS (VALUES(1) UNION SELECT x<<1 FROM c)
+    INSERT INTO r1(r) SELECT -1-x FROM c;
+
+  INSERT INTO t1(rowid, a) SELECT r, 'abc' FROM r1;
+}
+
+do_execsql_test 2.1 {
+  PRAGMA integrity_check;
+} {ok}
+
+do_execsql_test 2.2 {
+  SELECT rowid FROM t1('abc') ORDER BY +rowid;
+} [db eval {SELECT r FROM r1 ORDER BY r}]
+
+
+finish_test
diff --git a/manifest b/manifest
index 7c17707051..ec0d0dc8b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\spercential\sextension\seasier\sto\sincorporate\sas\sa\sbuilt-in\son\sWindows\napplications.
-D 2024-09-02T17:27:10.804
+C Fix\sa\stechnically\sundefined\ssigned\sinteger\soverflow\sin\sfts5.
+D 2024-09-02T18:41:59.039
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -99,7 +99,7 @@ F ext/fts5/fts5_buffer.c 0eec58bff585f1a44ea9147eae5da2447292080ea435957f7488c70
 F ext/fts5/fts5_config.c 353d2a0d12678cae6ab5b9ce54aed8dac0825667b69248b5a4ed81cbefc109ea
 F ext/fts5/fts5_expr.c 9a56f53700d1860f0ee2f373c2b9074eaf2a7aa0637d0e27a6476de26a3fee33
 F ext/fts5/fts5_hash.c adda4272be401566a6e0ba1acbe70ee5cb97fce944bc2e04dc707152a0ec91b1
-F ext/fts5/fts5_index.c eb9a0dda3bc6ef969a6be8d2746af56856e67251810ddba08622b45be8477abe
+F ext/fts5/fts5_index.c 571483823193f09439356741669aa8c81da838ae6f5e1bfa7517f7ee2fb3addd
 F ext/fts5/fts5_main.c 1fddb53f495425d9314c74b30c5848a9dd254be0e5f445bfe38292d5ab21c288
 F ext/fts5/fts5_storage.c 9a9b880be12901f1962ae2a5a7e1b74348b3099a1e728764e419f75d98e3e612
 F ext/fts5/fts5_tcl.c 4db9258a7882c5eac0da4433042132aaf15b87dd1e1636c7a6ca203abd2c8bfe
@@ -184,6 +184,7 @@ F ext/fts5/test/fts5full.test 97d263c1072f4a560929cca31e70f65d2ae232610e17e6affc
 F ext/fts5/test/fts5fuzz1.test 238d8c45f3b81342aa384de3e581ff2fa330bf922a7b69e484bbc06051a1080e
 F ext/fts5/test/fts5hash.test fd3e0367fbf0b0944d6936fdb22696350f57b9871069c6766251578a103e8a14
 F ext/fts5/test/fts5integrity.test 646796671205dae46af5bb12a49b5696483cfe8e12d71d21454940b13ace95ab
+F ext/fts5/test/fts5integrity2.test 4c3636615c0201232c44a8105d5cb14fd5499fd0ee3014d7ffd7e83aac76ece8
 F ext/fts5/test/fts5interrupt.test 20d04204d3e341b104c0c24a41596b6393a3a81eba1044c168db0e106f9ac92c
 F ext/fts5/test/fts5lastrowid.test f36298a1fb9f988bde060a274a7ce638faa9c38a31400f8d2d27ea9373e0c4a1
 F ext/fts5/test/fts5leftjoin.test c0b4cafb9661379e576dc4405c0891d8fcc2782680740513c4d1fc114b43d4ad
@@ -2211,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6e5f146e274b210749dd8923a2da56905eb098b5a66699ff9130e3e51b1ff662
-R 517bb648cfa00dbab550ea88d8ac0979
-U drh
-Z cfd9af88a034a1a9fa4582930541e35b
+P 831e2be4117dc7f5113f66d3e484ca34e4405444ac7b0def12ee9a00608d40da
+R c9ac0677bad9a9035657d136a5035194
+U dan
+Z a6e59573e987571a1350f930eef496ac
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3837f5d0dd..4138045228 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-831e2be4117dc7f5113f66d3e484ca34e4405444ac7b0def12ee9a00608d40da
+e6bec37ea1ca51e1d048941ce4c5211d8fc5c5e3556a1441f9c79b036843f9e3

From 7c6f2880aaf6c2632381da5eb59da2a4b98cf013 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 2 Sep 2024 21:59:31 +0000
Subject: [PATCH 28/50] Fix possible NULL pointer dereference following OOM in
 the new error reporting logic of the percentile extension.

FossilOrigin-Name: 7891a266c4425722ae8b9231397ef9e42e2432be9e6b70632dfaf9ff15300d2c
---
 ext/misc/percentile.c |  2 +-
 manifest              | 14 +++++++-------
 manifest.uuid         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index e02fa6efd8..1d69a49398 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -218,7 +218,7 @@ static void percentError(sqlite3_context *pCtx, const char *zFormat, ...){
   va_start(ap, zFormat);
   zMsg1 = sqlite3_vmprintf(zFormat, ap);
   va_end(ap);
-  zMsg2 = sqlite3_mprintf(zMsg1, pFunc->zName);
+  zMsg2 = zMsg1 ? sqlite3_mprintf(zMsg1, pFunc->zName) : 0;
   sqlite3_result_error(pCtx, zMsg2, -1);
   sqlite3_free(zMsg1);
   sqlite3_free(zMsg2);
diff --git a/manifest b/manifest
index ec0d0dc8b2..c660dea881 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stechnically\sundefined\ssigned\sinteger\soverflow\sin\sfts5.
-D 2024-09-02T18:41:59.039
+C Fix\spossible\sNULL\spointer\sdereference\sfollowing\sOOM\sin\sthe\snew\serror\sreporting\nlogic\sof\sthe\spercentile\sextension.
+D 2024-09-02T21:59:31.581
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -411,7 +411,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c 2ab82e3ce7bbf22ede8c3e894b767281fbdb482d7b399c105b6f5646b41eb8a3
+F ext/misc/percentile.c b37f01f559cec6ed3c4bcf5079e355cfe8a64eb32cc15c3b0f531980fd632b67
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 831e2be4117dc7f5113f66d3e484ca34e4405444ac7b0def12ee9a00608d40da
-R c9ac0677bad9a9035657d136a5035194
-U dan
-Z a6e59573e987571a1350f930eef496ac
+P e6bec37ea1ca51e1d048941ce4c5211d8fc5c5e3556a1441f9c79b036843f9e3
+R b930e9b50558c8ecfca10ed9c4f54cf8
+U drh
+Z 4d2062160b04956960419c5966a96c49
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4138045228..ea91c10bca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6bec37ea1ca51e1d048941ce4c5211d8fc5c5e3556a1441f9c79b036843f9e3
+7891a266c4425722ae8b9231397ef9e42e2432be9e6b70632dfaf9ff15300d2c

From 22cd1eec5ae516facb39a9ac3efbf6a28f170237 Mon Sep 17 00:00:00 2001
From: larrybr <larrybr@noemail.net>
Date: Tue, 3 Sep 2024 02:09:13 +0000
Subject: [PATCH 29/50] Cause cfGets() (under SQLITE_USE_ONLY_WIN32) to better
 emulate fgets().

FossilOrigin-Name: 2d783524d1671d988ebb1b21c83de99c9f335963b6c20cf4df612f58c13da913
---
 ext/consio/console_io.c |  9 ++++++++-
 manifest                | 14 +++++++-------
 manifest.uuid           |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ext/consio/console_io.c b/ext/consio/console_io.c
index 6b837cbafc..75324a34fd 100755
--- a/ext/consio/console_io.c
+++ b/ext/consio/console_io.c
@@ -655,6 +655,10 @@ cfWrite(const void *buf, size_t osz, size_t ocnt, FILE *pf){
   return rv;
 }
 
+/* An fgets() equivalent, using Win32 file API for actual input.
+** Input ends when given buffer is filled or a newline is read.
+** If the FILE object is in text mode, swallows 0x0D. (ASCII CR)
+*/
 SQLITE_INTERNAL_LINKAGE char *
 cfGets(char *cBuf, int n, FILE *pf){
   int nci = 0;
@@ -665,7 +669,10 @@ cfGets(char *cBuf, int n, FILE *pf){
   while( nci < n-1 ){
     DWORD nr;
     if( !ReadFile(fai.fh, cBuf+nci, 1, &nr, 0) || nr==0 ) break;
-    if( nr>0 && (!eatCR || cBuf[nci]!='\r') ) nci += nr;
+    if( nr>0 && (!eatCR || cBuf[nci]!='\r') ){
+      nci += nr;
+      if( cBuf[nci-nr]=='\n' ) break;
+    }
   }
   if( nci < n ) cBuf[nci] = 0;
   return (nci>0)? cBuf : 0;
diff --git a/manifest b/manifest
index ddb1f8bfb9..55e9207dbb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\savoid\sall\sC-runtime\sI/O\sif\sthe\sSQLITE_USE_ONLY_WIN32\sflag\sis\sdefined.
-D 2024-08-27T14:25:52.592
+C Cause\scfGets()\s(under\sSQLITE_USE_ONLY_WIN32)\sto\sbetter\semulate\sfgets().
+D 2024-09-03T02:09:13.849
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -53,7 +53,7 @@ F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
 F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91
 F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad1aff3294f94
 F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a
-F ext/consio/console_io.c 6e02dea912a49f55785b0027fe77960aafee6c236307c23f82ec86a69f1a2001 x
+F ext/consio/console_io.c d2b74afae8d301de2e8447b1045fcd33eb59df13bf581d906d99c74fe5d2b13f x
 F ext/consio/console_io.h b5ebe34aa15b357621ebbea3d3f2e2b24750d4280b5802516409e23947fd9ee5
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
@@ -2210,8 +2210,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2d52db98f47fbcda0622c034b21c2fb19bf4345b88c5c565ae9e6f7128642e43
-R fe2336ed930d3088aea807bfa7c9e690
-U drh
-Z dffceaa70fb90b81619d76d49bca0c7c
+P 164b1e1962aa1e16bdf52e9e86d4cf9c9e09220c0821932ac8e390e82074185f
+R 0ea7d1c943863a7b1da4b295016a8f50
+U larrybr
+Z 8cf571eafc534d90679b77113d98b6b5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5430ab55f6..47b76c643e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-164b1e1962aa1e16bdf52e9e86d4cf9c9e09220c0821932ac8e390e82074185f
+2d783524d1671d988ebb1b21c83de99c9f335963b6c20cf4df612f58c13da913

From 06638117bbbb9b086865f830a6168946c78abb44 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 3 Sep 2024 10:53:32 +0000
Subject: [PATCH 30/50] In testrunner.tcl, allow setting njob to zero, which
 causes no new jobs to be launched and for the process to shut down once all
 current jobs are completed.

FossilOrigin-Name: 0ef65fd4ba17def4c13986365b3af300c4024725af4bc314845d1af8be568ab4
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index c660dea881..bec335f8c6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\spossible\sNULL\spointer\sdereference\sfollowing\sOOM\sin\sthe\snew\serror\sreporting\nlogic\sof\sthe\spercentile\sextension.
-D 2024-09-02T21:59:31.581
+C In\stestrunner.tcl,\sallow\ssetting\snjob\sto\szero,\swhich\scauses\sno\snew\sjobs\nto\sbe\slaunched\sand\sfor\sthe\sprocess\sto\sshut\sdown\sonce\sall\scurrent\sjobs\sare\ncompleted.
+D 2024-09-03T10:53:32.903
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 662af46f1f0a41eb197f17583698853dd130ff3d47cf136dd519c3aecd9a9d7d
+F test/testrunner.tcl 92e3c63072362cd56d7dec2548284425104b5b3a5c0af3371ee2911712d89bf6
 F test/testrunner_data.tcl d64e69aba227492fc459eb0f6a88c3e1b252bd9323847b7e8bcf5e1faa358714
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e6bec37ea1ca51e1d048941ce4c5211d8fc5c5e3556a1441f9c79b036843f9e3
-R b930e9b50558c8ecfca10ed9c4f54cf8
+P 7891a266c4425722ae8b9231397ef9e42e2432be9e6b70632dfaf9ff15300d2c
+R 6a86d12ea82ce01298969ad043e5cc65
 U drh
-Z 4d2062160b04956960419c5966a96c49
+Z 5112afd2e4dab18f4b12bbba01825cee
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ea91c10bca..9843b7b310 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7891a266c4425722ae8b9231397ef9e42e2432be9e6b70632dfaf9ff15300d2c
+0ef65fd4ba17def4c13986365b3af300c4024725af4bc314845d1af8be568ab4
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 7ebb173c0c..547dc08985 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -356,8 +356,8 @@ if {([llength $argv]==2 || [llength $argv]==1)
   sqlite3 mydb $TRG(dbname)
   if {[llength $argv]==2} {
     set param [lindex $argv 1]
-    if {[string is integer $param]==0 || $param<1 || $param>128} {
-      puts stderr "parameter must be an integer between 1 and 128"
+    if {[string is integer $param]==0 || $param<0 || $param>128} {
+      puts stderr "parameter must be an integer between 0 and 128"
       exit 1
     }
 

From e6e49bfef29b29e75fe86451b8c40a6ef114412f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 3 Sep 2024 12:41:21 +0000
Subject: [PATCH 31/50] Fix harmless compiler warnings in the percentile
 extension.

FossilOrigin-Name: c5557f281c6294b6db6682349d245feac7c6ce7f4f61356f486afdf186c566c4
---
 ext/misc/percentile.c |  6 +++---
 manifest              | 12 ++++++------
 manifest.uuid         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/misc/percentile.c b/ext/misc/percentile.c
index 1d69a49398..1c6191d42e 100644
--- a/ext/misc/percentile.c
+++ b/ext/misc/percentile.c
@@ -307,7 +307,7 @@ static void percentStep(sqlite3_context *pCtx, int argc, sqlite3_value **argv){
   }else if( p->bKeepSorted ){
     int i;
     i = percentBinarySearch(p, y, 0);
-    if( i<p->nUsed ){
+    if( i<(int)p->nUsed ){
       memmove(&p->a[i+1], &p->a[i], (p->nUsed-i)*sizeof(p->a[0]));
     }
     p->a[i] = y;
@@ -423,7 +423,7 @@ static void percentInverse(sqlite3_context *pCtx,int argc,sqlite3_value **argv){
   i = percentBinarySearch(p, y, 1);
   if( i>=0 ){
     p->nUsed--;
-    if( i<p->nUsed ){
+    if( i<(int)p->nUsed ){
       memmove(&p->a[i], &p->a[i+1], (p->nUsed - i)*sizeof(p->a[0]));
     }
   }
@@ -483,7 +483,7 @@ int sqlite3_percentile_init(
   const sqlite3_api_routines *pApi
 ){
   int rc = SQLITE_OK;
-  int i;
+  unsigned int i;
 #if defined(SQLITE3_H) || defined(SQLITE_STATIC_PERCENTILE)
   (void)pApi;      /* Unused parameter */
 #else
diff --git a/manifest b/manifest
index bec335f8c6..9d2a9f8cea 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\stestrunner.tcl,\sallow\ssetting\snjob\sto\szero,\swhich\scauses\sno\snew\sjobs\nto\sbe\slaunched\sand\sfor\sthe\sprocess\sto\sshut\sdown\sonce\sall\scurrent\sjobs\sare\ncompleted.
-D 2024-09-03T10:53:32.903
+C Fix\sharmless\scompiler\swarnings\sin\sthe\spercentile\sextension.
+D 2024-09-03T12:41:21.618
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -411,7 +411,7 @@ F ext/misc/nextchar.c 7877914c2a80c2f181dd04c3dbef550dfb54c93495dc03da2403b5dd58
 F ext/misc/noop.c f1a21cc9b7a4e667e5c8458d80ba680b8bd4315a003f256006046879f679c5a0
 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f
 F ext/misc/pcachetrace.c f4227ce03fb16aa8d6f321b72dd051097419d7a028a9853af048bee7645cb405
-F ext/misc/percentile.c b37f01f559cec6ed3c4bcf5079e355cfe8a64eb32cc15c3b0f531980fd632b67
+F ext/misc/percentile.c 42eb041edab407e512aaa087f99ed9287fe0b3224f7a6d194456c00fc1454312
 F ext/misc/prefixes.c 82645f79229877afab08c8b08ca1e7fa31921280906b90a61c294e4f540cd2a6
 F ext/misc/qpvtab.c fc189e127f68f791af90a487f4460ec91539a716daf45a0c357e963fd47cc06c
 F ext/misc/randomjson.c ef835fc64289e76ac4873b85fe12f9463a036168d7683cf2b773e36e6262c4ed
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7891a266c4425722ae8b9231397ef9e42e2432be9e6b70632dfaf9ff15300d2c
-R 6a86d12ea82ce01298969ad043e5cc65
+P 0ef65fd4ba17def4c13986365b3af300c4024725af4bc314845d1af8be568ab4
+R 2b10d334a3671a793c7868d6c8e12ad1
 U drh
-Z 5112afd2e4dab18f4b12bbba01825cee
+Z 339ed9f3d932cc4c3af3add15bcda94b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9843b7b310..d62eb99bea 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ef65fd4ba17def4c13986365b3af300c4024725af4bc314845d1af8be568ab4
+c5557f281c6294b6db6682349d245feac7c6ce7f4f61356f486afdf186c566c4

From 23a16c8387870a86aef8dea7f8dbad506dd29d94 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 3 Sep 2024 14:00:36 +0000
Subject: [PATCH 32/50] In testrunner.tcl, compile the Windows Default
 configuration using SQLITE_ENABLE_STMT_SCANSTATUS.

FossilOrigin-Name: 49e8b1635f29d9fd0dc2ef6e312fd4129f2283f68e9423d95ff9b55077688ad7
---
 manifest                 | 12 ++++++------
 manifest.uuid            |  2 +-
 test/testrunner_data.tcl |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 9d2a9f8cea..404dfb05fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\spercentile\sextension.
-D 2024-09-03T12:41:21.618
+C In\stestrunner.tcl,\scompile\sthe\sWindows\sDefault\sconfiguration\susing\nSQLITE_ENABLE_STMT_SCANSTATUS.
+D 2024-09-03T14:00:36.487
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1716,7 +1716,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
 F test/testrunner.tcl 92e3c63072362cd56d7dec2548284425104b5b3a5c0af3371ee2911712d89bf6
-F test/testrunner_data.tcl d64e69aba227492fc459eb0f6a88c3e1b252bd9323847b7e8bcf5e1faa358714
+F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ef65fd4ba17def4c13986365b3af300c4024725af4bc314845d1af8be568ab4
-R 2b10d334a3671a793c7868d6c8e12ad1
+P c5557f281c6294b6db6682349d245feac7c6ce7f4f61356f486afdf186c566c4
+R af529c0653dd6eafafdc4a7dab6ec4ca
 U drh
-Z 339ed9f3d932cc4c3af3add15bcda94b
+Z 9034919d1245ea10e06eda748f2be5e1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d62eb99bea..32840dde2a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5557f281c6294b6db6682349d245feac7c6ce7f4f61356f486afdf186c566c4
+49e8b1635f29d9fd0dc2ef6e312fd4129f2283f68e9423d95ff9b55077688ad7
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index f9a23063cb..78f28bbf8e 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -88,6 +88,7 @@ namespace eval trd {
     --disable-amalgamation --disable-shared
     --enable-session
     -DSQLITE_ENABLE_RBU
+    -DSQLITE_ENABLE_STMT_SCANSTATUS
   }
 
   # These two are used by [testrunner.tcl mdevtest] (All-O0) and 

From fd486258a0295689e04e12ada08f76a061a37deb Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 3 Sep 2024 16:04:34 +0000
Subject: [PATCH 33/50] Enhance the "errors" command in testrunner.tcl so that
 it accepts the "-s" or "--summary" argument to see a list of failed jobs, and
 so that an additional argument is a GLOB pattern that restricts the output to
 jobs whose names match that pattern.

FossilOrigin-Name: dcbebe30f594a99e23b5ccd8d199b92118204a3e52e75c78d98c394601252e81
---
 manifest            | 13 ++++++-------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 45 +++++++++++++++++++++++++++++++++++----------
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/manifest b/manifest
index 6f14866d00..3b79cd2f96 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sext/consio\sso\sthat\sit\sworks\scorrectly\swith\sSQLITE_USE_ONLY_WIN32.
-D 2024-09-03T14:15:57.425
+C Enhance\sthe\s"errors"\scommand\sin\stestrunner.tcl\sso\sthat\sit\saccepts\sthe\s\n"-s"\sor\s"--summary"\sargument\sto\ssee\sa\slist\sof\sfailed\sjobs,\sand\sso\sthat\nan\sadditional\sargument\sis\sa\sGLOB\spattern\sthat\srestricts\sthe\soutput\sto\njobs\swhose\snames\smatch\sthat\spattern.
+D 2024-09-03T16:04:34.164
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 92e3c63072362cd56d7dec2548284425104b5b3a5c0af3371ee2911712d89bf6
+F test/testrunner.tcl d117492b6ec7293f7906dd4ff48135dd9801bdf42db0f48f88b3328867aa94ff
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,9 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 49e8b1635f29d9fd0dc2ef6e312fd4129f2283f68e9423d95ff9b55077688ad7 2d783524d1671d988ebb1b21c83de99c9f335963b6c20cf4df612f58c13da913
-R 1f005fca5fe5df8e4ebc8001e171645f
-T +closed 2d783524d1671d988ebb1b21c83de99c9f335963b6c20cf4df612f58c13da913
+P efc6f3d7e92a25f440fb8d392daf325af5ca7dca104a5bb4bd59f7df93af53b0
+R 1cc8a7ec499a68123307944e86d4ccaa
 U drh
-Z 207a73144d24fc75006dde9e7a085311
+Z 54536ba1c60ddf4f4f932c617d6c5425
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f51ba4769e..06dec1c0fe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-efc6f3d7e92a25f440fb8d392daf325af5ca7dca104a5bb4bd59f7df93af53b0
+dcbebe30f594a99e23b5ccd8d199b92118204a3e52e75c78d98c394601252e81
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 547dc08985..d265233f00 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -54,7 +54,7 @@ proc usage {} {
 Usage: 
     $a0 ?SWITCHES? ?PERMUTATION? ?PATTERNS?
     $a0 PERMUTATION FILE
-    $a0 errors ?-v|--verbose?
+    $a0 errors ?-v|--verbose? ?-s|--summary? ?PATTERN?
     $a0 help
     $a0 njob ?NJOB?
     $a0 script ?-msvc? CONFIG
@@ -112,10 +112,12 @@ The "script" command outputs the script used to build a configuration.
 Add the "-msvc" option for a Windows-compatible script. For a list of
 available configurations enter "$a0 script help".
 
-The "errors" commands shows the output of all tests that failed in the
+The "errors" commands shows the output of tests that failed in the
 most recent run.  Complete output is shown if the -v or --verbose options
 are used.  Otherwise, an attempt is made to minimize the output to show
-only the parts that contain the error messages.
+only the parts that contain the error messages.  The --summary option just
+shows the jobs that failed.  If PATTERN are provided, the error information
+is only provided for jobs that match PATTERN.
 
 Full documentation here: https://sqlite.org/src/doc/trunk/doc/testrunner.md
   }]]
@@ -606,15 +608,21 @@ proc aggregate_test_counts {db} {
 #--------------------------------------------------------------------------
 # Check if this is the "errors" command:
 #
-if {[llength $argv]>=1 && [llength $argv]<=2
+if {[llength $argv]>=1
  && ([string compare -nocase errors [lindex $argv 0]]==0 ||
      [string match err* [lindex $argv 0]]==1)
 } {
   set verbose 0
+  set pattern {}
+  set summary 0
   for {set ii 1} {$ii<[llength $argv]} {incr ii} {
     set a0 [lindex $argv $ii]
     if {$a0=="-v" || $a0=="--verbose" || $a0=="-verbose"} {
       set verbose 1
+    } elseif {$a0=="-s" || $a0=="--summary" || $a0=="-summary"} {
+      set summary 1
+    } elseif {$pattern==""} {
+      set pattern *[string trim $a0 *]*
     } else {
       puts "unknown option: \"$a0\"".  Use --help for more info."
       exit 1
@@ -622,9 +630,22 @@ if {[llength $argv]>=1 && [llength $argv]<=2
   }
   set cnt 0
   sqlite3 mydb $TRG(dbname)
-  mydb timeout 2000
-  mydb eval {SELECT displaytype, displayname, output
-               FROM jobs WHERE state='failed'} {
+  mydb timeout 5000
+  if {$summary} {
+    set sql "SELECT displayname FROM jobs WHERE state='failed'"
+  } else {
+    set sql "SELECT displaytype, displayname, output FROM jobs \
+              WHERE state='failed'"
+  }
+  if {$pattern!=""} {
+    regsub -all {[^a-zA-Z0-9*/ ?]} $pattern . pattern
+    append sql " AND displayname GLOB '$pattern'"
+  }
+  mydb eval $sql {
+    if {$summary} {
+      puts "FAILED: $displayname"
+      continue
+    }
     puts "**** $displayname ****"
     if {$verbose || $displaytype!="tcl"} {
       puts $output
@@ -637,9 +658,13 @@ if {[llength $argv]>=1 && [llength $argv]<=2
     }
     incr cnt
   }
-  set summary [aggregate_test_counts mydb]
-  mydb close
-  puts "Total [lindex $summary 0] errors out of [lindex $summary 1] tests"
+  if {$pattern==""} {
+    set summary [aggregate_test_counts mydb]
+    mydb close
+    puts "Total [lindex $summary 0] errors out of [lindex $summary 1] tests"
+  } else {
+    mydb close
+  }
   exit
 }
 

From c81ab76cd9f2ec77cb9e1219b504d741845a0703 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 4 Sep 2024 11:22:47 +0000
Subject: [PATCH 34/50] Add the "joblist" command to testrunner.tcl

FossilOrigin-Name: f64469f4806d4d5d7103c171a37a542c7aab9db09a226bccd8411e9ccd55353d
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 46 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 3b79cd2f96..ffd3047098 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s"errors"\scommand\sin\stestrunner.tcl\sso\sthat\sit\saccepts\sthe\s\n"-s"\sor\s"--summary"\sargument\sto\ssee\sa\slist\sof\sfailed\sjobs,\sand\sso\sthat\nan\sadditional\sargument\sis\sa\sGLOB\spattern\sthat\srestricts\sthe\soutput\sto\njobs\swhose\snames\smatch\sthat\spattern.
-D 2024-09-03T16:04:34.164
+C Add\sthe\s"joblist"\scommand\sto\stestrunner.tcl
+D 2024-09-04T11:22:47.766
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl d117492b6ec7293f7906dd4ff48135dd9801bdf42db0f48f88b3328867aa94ff
+F test/testrunner.tcl 34652534e0085d9578a8b6fe86e93c387bebbcd321dde4aecadc4cf0c8b220ee
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P efc6f3d7e92a25f440fb8d392daf325af5ca7dca104a5bb4bd59f7df93af53b0
-R 1cc8a7ec499a68123307944e86d4ccaa
+P dcbebe30f594a99e23b5ccd8d199b92118204a3e52e75c78d98c394601252e81
+R 526b505ed9ff61539ab1544a16cc762d
 U drh
-Z 54536ba1c60ddf4f4f932c617d6c5425
+Z ec42621d2cdae6fdf4751b132650e441
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 06dec1c0fe..199d71e02d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dcbebe30f594a99e23b5ccd8d199b92118204a3e52e75c78d98c394601252e81
+f64469f4806d4d5d7103c171a37a542c7aab9db09a226bccd8411e9ccd55353d
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index d265233f00..11c4bbcd1f 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -56,6 +56,7 @@ Usage:
     $a0 PERMUTATION FILE
     $a0 errors ?-v|--verbose? ?-s|--summary? ?PATTERN?
     $a0 help
+    $a0 joblist ?PATTERN?
     $a0 njob ?NJOB?
     $a0 script ?-msvc? CONFIG
     $a0 status ?-d SECS? ?--cls?
@@ -579,6 +580,51 @@ if {[llength $argv]>=1
   exit
 }
 
+#--------------------------------------------------------------------------
+# Check if this is the "joblist" command:
+#
+if {[llength $argv]>=1 
+ && [string compare -nocase "joblist" [lindex $argv 0]]==0 
+} {
+  set pattern {}
+  for {set ii 1} {$ii<[llength $argv]} {incr ii} {
+    set a0 [lindex $argv $ii]
+    if {$pattern==""} {
+      set pattern [string trim $a0 *]
+    } else {
+      puts "unknown option: \"$a0\""
+      exit 1
+    }
+  }
+  set SQL {SELECT displaytype, displayname, state FROM jobs}
+  if {$pattern!=""} {
+    regsub -all {[^a-zA-Z0-9*.-/]} $pattern ? pattern
+    append SQL " WHERE displayname GLOB '*$pattern*'"
+  }
+  append SQL " ORDER BY starttime"
+
+  if {![file readable $TRG(dbname)]} {
+    puts "Database missing: $TRG(dbname)"
+    exit
+  }
+  sqlite3 mydb $TRG(dbname)
+  mydb timeout 2000
+
+  mydb eval $SQL {
+    set label UNKNOWN
+    switch -- $state {
+      ready {set label READY}
+      done {set label DONE}
+      failed {set label FAILED}
+      omit {set label OMIT}
+      running {set label RUNNING}
+    }
+    puts [format {%-7s %-5s %s} $label $displaytype $displayname]
+  }
+  mydb close
+  exit
+}
+
 # Scan the output of all jobs looking for the summary lines that
 # report the number of test cases and the number of errors.
 # Aggregate these numbers and return them.

From 3c72072a6f5e1145573f08c788f5f57a5fd2544e Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 4 Sep 2024 13:09:58 +0000
Subject: [PATCH 35/50] Make extra efforts to delete the over-size directory
 names created by the win32longpath.test module.

FossilOrigin-Name: 3c8035ed3f023fb31f65f298fb9ce19d4fa7a5511bd90877b27969f5f0892472
---
 manifest                | 12 ++++++------
 manifest.uuid           |  2 +-
 test/win32longpath.test | 11 +++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index ffd3047098..049ece78b5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"joblist"\scommand\sto\stestrunner.tcl
-D 2024-09-04T11:22:47.766
+C Make\sextra\sefforts\sto\sdelete\sthe\sover-size\sdirectory\snames\screated\sby\nthe\swin32longpath.test\smodule.
+D 2024-09-04T13:09:58.914
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2051,7 +2051,7 @@ F test/wherelimit3.test 22d73e046870cf8bbe15573eda6b432b07ebe64a88711f9f849c6b36
 F test/widetab1.test c296a98e123762de79917350e45fa33fdf88577a2571eb3a64c8bf7e44ef74d1
 F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2aeee74
 F test/win32lock.test e0924eb8daac02bf80e9da88930747bd44dd9b230b7759fed927b1655b467c9c
-F test/win32longpath.test 42210789bcfc5c0ac202643d6d0237db08df2c9218f2070d9a69e8af1eccf7d7
+F test/win32longpath.test 304006024ca47104bf5a7415ef31ca83ecfc29351af202baf8588b880cffc116
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
 F test/window1.test 79dc3b9a2226f622d7e104a1fc750d1c4c3c08d6147b59085bdbe05352947ffa
 F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dcbebe30f594a99e23b5ccd8d199b92118204a3e52e75c78d98c394601252e81
-R 526b505ed9ff61539ab1544a16cc762d
+P f64469f4806d4d5d7103c171a37a542c7aab9db09a226bccd8411e9ccd55353d
+R b8f539347cbc9843b6ed8aa52a0e1bab
 U drh
-Z ec42621d2cdae6fdf4751b132650e441
+Z f80762a3e5420a06ffd6178d73ee51c7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 199d71e02d..7f556a75fd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f64469f4806d4d5d7103c171a37a542c7aab9db09a226bccd8411e9ccd55353d
+3c8035ed3f023fb31f65f298fb9ce19d4fa7a5511bd90877b27969f5f0892472
diff --git a/test/win32longpath.test b/test/win32longpath.test
index c0eac8d9de..9ffea775e7 100644
--- a/test/win32longpath.test
+++ b/test/win32longpath.test
@@ -127,6 +127,17 @@ foreach tn {1a 1b 1c 1d 1e 1f} {
   db3 close
 }
 
+# These over-length file and directory names are difficult to delete.
+# The "file delete -force" might not work, depending on the TCL build
+# being used.  So first try to delete using the windows rmdir command.
+#
+set fd [open cleanup.bat w]
+puts $fd "rmdir /q /s $longPath(1)"
+close $fd
+if {[catch {exec cleanup.bat} msg]} {
+  puts "Command \[cleanup.bat\] returns $msg"
+}
+
 file delete -force $fileName
 file delete -force $longPath(3)
 file delete -force $longPath(2)

From 109025c0a4a97d0fb48faf6e2d698955ab7f8e06 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 4 Sep 2024 13:42:19 +0000
Subject: [PATCH 36/50] Put a proper shebang at the start of the testrunner.tcl
 script and make the script executable.

FossilOrigin-Name: c0c6e9abebf76358625f30a179658319b260baba6eded2a4c5ad356143e36f97
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 test/testrunner.tcl

diff --git a/manifest b/manifest
index 049ece78b5..8ea6cf8851 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sextra\sefforts\sto\sdelete\sthe\sover-size\sdirectory\snames\screated\sby\nthe\swin32longpath.test\smodule.
-D 2024-09-04T13:09:58.914
+C Put\sa\sproper\sshebang\sat\sthe\sstart\sof\sthe\stestrunner.tcl\sscript\sand\smake\sthe\nscript\sexecutable.
+D 2024-09-04T13:42:19.755
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 34652534e0085d9578a8b6fe86e93c387bebbcd321dde4aecadc4cf0c8b220ee
+F test/testrunner.tcl 982939f0f1835007298b92e52694c207d16ef79143993b35e5cbc9f0c585938b x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f64469f4806d4d5d7103c171a37a542c7aab9db09a226bccd8411e9ccd55353d
-R b8f539347cbc9843b6ed8aa52a0e1bab
+P 3c8035ed3f023fb31f65f298fb9ce19d4fa7a5511bd90877b27969f5f0892472
+R f05e13077e7a870b4aeeb1b6e8984529
 U drh
-Z f80762a3e5420a06ffd6178d73ee51c7
+Z 24d0fb17858b3b348074c639926c08cb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7f556a75fd..fd22bb9d40 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c8035ed3f023fb31f65f298fb9ce19d4fa7a5511bd90877b27969f5f0892472
+c0c6e9abebf76358625f30a179658319b260baba6eded2a4c5ad356143e36f97
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
old mode 100644
new mode 100755
index 11c4bbcd1f..a63a22d2fc
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -1,3 +1,6 @@
+#!/bin/sh
+# Script to runs tests for SQLite.  Run with option "help" for more info. \
+exec tclsh "$0" "$@"
 
 set dir [pwd]
 set testdir [file normalize [file dirname $argv0]]

From bb4d2edf109be3f978807dd6f3a9d80624da1029 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 4 Sep 2024 16:01:44 +0000
Subject: [PATCH 37/50] Fix a bug in the parsing of some corner-case JSON PATH
 strings that contain escaped double-quotes.

FossilOrigin-Name: 60ac55c4b76355aaf7cbde38bf1f6082ff5612bf4ffc49ab69d00fd4e3d64e64
---
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 src/json.c        |  4 +++-
 test/json502.test | 13 +++++++++++++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 8ea6cf8851..eb0b2807fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Put\sa\sproper\sshebang\sat\sthe\sstart\sof\sthe\stestrunner.tcl\sscript\sand\smake\sthe\nscript\sexecutable.
-D 2024-09-04T13:42:19.755
+C Fix\sa\sbug\sin\sthe\sparsing\sof\ssome\scorner-case\sJSON\sPATH\sstrings\sthat\scontain\nescaped\sdouble-quotes.
+D 2024-09-04T16:01:44.145
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -726,7 +726,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c f8d1a0f8ee258411009c6b7f2d93170e351bd19f5ad89d57e1180644297cbe70
-F src/json.c 5b6a1d6015997b9ee848a32948720bdb26a0ef2de5a2127ebf7355ce66dbdc0d
+F src/json.c 68a98c020c22127f2d65f08855f7fc7460ff352a6ce0b543d8931dde83319c22
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c e7b53893f9fb3ad76baa8513f85c167b34d5c8e25ce64608db440f5637d0fe9e
@@ -1381,7 +1381,7 @@ F test/json106.test 4aed3afd16549045d198a8d9cea00deea96e1f2ecf55864dce96cac558b8
 F test/json107.test 59054e815c8f6b67d634d44ace421cf975828fb5651c4460aa66015c8e19d562
 F test/json108.test 0a5f1e2d4b35a1bc33052563d2a5ede03052e2099e58cb424547656c898e0f49
 F test/json501.test b95e2d14988b682a5cadf079dd6162f0f85fb74cd59c6b1f1624110104a974eb
-F test/json502.test 84634d3dbb521d2814e43624025b760c6198456c8197bbec6c977c0236648f5b
+F test/json502.test 4ef68e4f272dfb083d4cbceb4e9e51d67ec1186a185e0c13637c50a4dc2f9796
 F test/jsonb01.test f4cdfb4cf5a0c940091b17675ed9583f45add0c938f07d65b0de0e19d3a9a101
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c 6e0228409ea7ca0497dad503fbd109badb5e59545d131014b6aaac68b56f484a
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3c8035ed3f023fb31f65f298fb9ce19d4fa7a5511bd90877b27969f5f0892472
-R f05e13077e7a870b4aeeb1b6e8984529
+P c0c6e9abebf76358625f30a179658319b260baba6eded2a4c5ad356143e36f97
+R c9ec90e0d0ba3db3bca78a08a6c286b8
 U drh
-Z 24d0fb17858b3b348074c639926c08cb
+Z c8dd2f7c1df9f10ff01ca20270187b6f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fd22bb9d40..70820e2597 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c0c6e9abebf76358625f30a179658319b260baba6eded2a4c5ad356143e36f97
+60ac55c4b76355aaf7cbde38bf1f6082ff5612bf4ffc49ab69d00fd4e3d64e64
diff --git a/src/json.c b/src/json.c
index 7361c46d89..a0a075e66c 100644
--- a/src/json.c
+++ b/src/json.c
@@ -2847,7 +2847,9 @@ static u32 jsonLookupStep(
     zPath++;
     if( zPath[0]=='"' ){
       zKey = zPath + 1;
-      for(i=1; zPath[i] && zPath[i]!='"'; i++){}
+      for(i=1; zPath[i] && zPath[i]!='"'; i++){
+        if( zPath[i]=='\\' && zPath[i+1]!=0 ) i++;
+      }
       nKey = i-1;
       if( zPath[i] ){
         i++;
diff --git a/test/json502.test b/test/json502.test
index cc14b8cb71..1eba00dba5 100644
--- a/test/json502.test
+++ b/test/json502.test
@@ -64,4 +64,17 @@ ifcapable vtab {
   } {{\x17} 1 integer 1 1 null {$."\x17"} {$}}
 }
 
+# JSON PATH parsing bug involving backslash escapes, reported via
+# private email from Florent De'Neve on 2024-09-04.
+#
+do_execsql_test 5.1 {
+  SELECT json_extract('{"A\"Key":1}', '$.A"Key');
+} 1
+do_execsql_test 5.2 {
+  SELECT json_extract('{"A\"Key":1}', '$."A\"Key"');
+} 1
+do_execsql_test 5.3 {
+  SELECT JSON_SET('{}', '$."\"Key"', 1);
+} {{{"\"Key":1}}}
+
 finish_test

From 7bd230cf4da87afa6adb44a53fb29845e3f7e5fc Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 4 Sep 2024 18:51:59 +0000
Subject: [PATCH 38/50] Make the default TCLDIR be C:\Tcl in the Makefile.msc.

FossilOrigin-Name: c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d
---
 Makefile.msc  |  2 +-
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index fde1f31a9f..36a0ed3abe 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -938,7 +938,7 @@ TCLSUFFIX =
 !ENDIF
 
 !IFNDEF TCLDIR
-TCLDIR = $(TOP)\compat\tcl
+TCLDIR = C:\Tcl
 !ENDIF
 
 !IFNDEF TCLINCDIR
diff --git a/manifest b/manifest
index eb0b2807fd..8775a8ed5f 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Fix\sa\sbug\sin\sthe\sparsing\sof\ssome\scorner-case\sJSON\sPATH\sstrings\sthat\scontain\nescaped\sdouble-quotes.
-D 2024-09-04T16:01:44.145
+C Make\sthe\sdefault\sTCLDIR\sbe\sC:\\Tcl\sin\sthe\sMakefile.msc.
+D 2024-09-04T18:51:59.227
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in af5fbc3453b745daa68c7aa5dfdb945c09cb724971db3b783d6b5e1a62279e28
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 2c905f4c795a628d7fd892294e8fdec6d5f719fa5b252cb839fed147e64435a0
+F Makefile.msc e72a4653ea8f48efd14c7dac1e7de308a1f3cc91f905f15cbcacc680301c8f03
 F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c0c6e9abebf76358625f30a179658319b260baba6eded2a4c5ad356143e36f97
-R c9ec90e0d0ba3db3bca78a08a6c286b8
+P 60ac55c4b76355aaf7cbde38bf1f6082ff5612bf4ffc49ab69d00fd4e3d64e64
+R 7c445598106af51bfd865380701cef37
 U drh
-Z c8dd2f7c1df9f10ff01ca20270187b6f
+Z 345e63504eb5893ea2a5338064417dd5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 70820e2597..2340dd1354 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60ac55c4b76355aaf7cbde38bf1f6082ff5612bf4ffc49ab69d00fd4e3d64e64
+c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d

From 6aedd6d9fce717e366af1c10c801eb5b6afec2df Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 5 Sep 2024 11:46:43 +0000
Subject: [PATCH 39/50] Faster implementation of the aggregate_test_counts
 procedure inside of testrunner.tcl.

FossilOrigin-Name: a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 23 ++++-------------------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/manifest b/manifest
index 8775a8ed5f..106a4d98ac 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sdefault\sTCLDIR\sbe\sC:\\Tcl\sin\sthe\sMakefile.msc.
-D 2024-09-04T18:51:59.227
+C Faster\simplementation\sof\sthe\saggregate_test_counts\sprocedure\sinside\sof\ntestrunner.tcl.
+D 2024-09-05T11:46:43.981
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 982939f0f1835007298b92e52694c207d16ef79143993b35e5cbc9f0c585938b x
+F test/testrunner.tcl 68b23b52e9ba45eb294b2597c27c383d12129afc06e33c8771313c7238bd1c44 x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 60ac55c4b76355aaf7cbde38bf1f6082ff5612bf4ffc49ab69d00fd4e3d64e64
-R 7c445598106af51bfd865380701cef37
+P c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d
+R f43ab99ba85b48d85b41205bb3574221
 U drh
-Z 345e63504eb5893ea2a5338064417dd5
+Z ff8ebe5698dd3ab04755716aae5f59e1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2340dd1354..7f61e5a5d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d
+a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index a63a22d2fc..ccf888b572 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -633,25 +633,10 @@ if {[llength $argv]>=1
 # Aggregate these numbers and return them.
 #
 proc aggregate_test_counts {db} {
-  set ncase 0
-  set nerr 0
-  $db eval {SELECT output FROM jobs WHERE displaytype IN ('tcl','fuzz')} {
-    set n 0
-    set m 0
-    if {[regexp {(\d+) errors out of (\d+) tests} $output all n m]
-        && [string is integer -strict $n]
-        && [string is integer -strict $m]} {
-      incr ncase $m
-      incr nerr $n
-    } elseif {[regexp {sessionfuzz.*: *(\d+) cases, (\d+) crash} $output \
-                      all m n]
-              && [string is integer -strict $m]
-              && [string is integer -strict $n]} {
-      incr ncase $m
-      incr nerr $n
-    }
-  }
-  return [list $nerr $ncase]
+  set ne 0
+  set nt 0
+  $db eval {SELECT sum(nerr) AS ne, sum(ntest) as nt FROM jobs} break
+  return [list $ne $nt]
 }
 
 #--------------------------------------------------------------------------

From 21e7816e651eb0e4fc67283b7acbc540c2a96cae Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 5 Sep 2024 12:06:45 +0000
Subject: [PATCH 40/50] Enhance testrunner.tcl to keep track of the platform
 and SQLite version as reported by individual test cases and to report that
 information in the summary at the end of each test run.

FossilOrigin-Name: 80ebb7c7e686cd936ac834f2258f585a7004762593e0bc859ecd75d6fb0badfd
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 19 +++++++++++++++++--
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 106a4d98ac..0d01cba7f0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Faster\simplementation\sof\sthe\saggregate_test_counts\sprocedure\sinside\sof\ntestrunner.tcl.
-D 2024-09-05T11:46:43.981
+C Enhance\stestrunner.tcl\sto\skeep\strack\sof\sthe\splatform\sand\sSQLite\sversion\nas\sreported\sby\sindividual\stest\scases\sand\sto\sreport\sthat\sinformation\sin\sthe\nsummary\sat\sthe\send\sof\seach\stest\srun.
+D 2024-09-05T12:06:45.482
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 68b23b52e9ba45eb294b2597c27c383d12129afc06e33c8771313c7238bd1c44 x
+F test/testrunner.tcl 1ebde7e8b57c464b9eb6ce047977c1edb46688b2ab94cc67e3cd5e4a3645ff00 x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d
-R f43ab99ba85b48d85b41205bb3574221
+P a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf
+R a6deed6e9bd78f423240221d74d8d7b3
 U drh
-Z ff8ebe5698dd3ab04755716aae5f59e1
+Z 8cf0ea19b5a0efdaca6c57466a00e96c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7f61e5a5d3..9f0908d687 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf
+80ebb7c7e686cd936ac834f2258f585a7004762593e0bc859ecd75d6fb0badfd
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index ccf888b572..cd9d0daff5 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -290,6 +290,8 @@ set TRG(schema) {
     state TEXT CHECK( state IN ('','ready','running','done','failed','omit') ),
     ntest INT,                          -- Number of test cases run
     nerr INT,                           -- Number of errors reported
+    svers TEXT,                         -- Reported SQLite version
+    pltfm TEXT,                         -- Host platform reported
     output TEXT                         -- test output
   );
 
@@ -1255,6 +1257,10 @@ proc mark_job_as_finished {jobid output state endtm} {
       set nerr $a
       set ntest $b
     }
+    regexp {\y\d+ errors out of \d+ tests (on [^\n]+-bit \S+-endian)} \
+         $output all pltfm
+    regexp {\ySQLite \d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [0-9a-fA-F]+} \
+         $output svers
   }
   r_write_db {
     if {$state=="failed"} {
@@ -1266,7 +1272,7 @@ proc mark_job_as_finished {jobid output state endtm} {
     trdb eval {
       UPDATE jobs 
         SET output=$output, state=$state, endtime=$endtm,
-            ntest=$ntest, nerr=$nerr
+            ntest=$ntest, nerr=$nerr, svers=$svers, pltfm=$pltfm
         WHERE jobid=$jobid;
       UPDATE jobs SET state=$childstate WHERE depid=$jobid;
     }
@@ -1519,7 +1525,16 @@ proc run_testset {} {
        FROM jobs WHERE endtime>0
   } break;
   set et [elapsetime $totaltime]
-  puts "$totalerr errors out of $totaltest tests in about $et"
+  set pltfm {}
+  trdb eval {
+     SELECT pltfm, count(*) FROM jobs WHERE pltfm IS NOT NULL
+      ORDER BY 2 DESC LIMIT 1
+  } {puts $pltfm}
+  puts "$totalerr errors out of $totaltest tests in about $et $pltfm"
+  trdb eval {
+     SELECT DISTINCT svers FROM jobs WHERE svers IS NOT NULL
+  } {puts $svers}
+
 }
 
 # Handle the --buildonly option, if it was specified.

From 4987c5c3c24755bd2b19c4bd0fa11dc3b04d260b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 5 Sep 2024 15:28:15 +0000
Subject: [PATCH 41/50] Testrunner.tcl enhancements:  (1) Attempt to build the
 SQLite tcl extension if it is not already available.  (2) testrunner target
 "devtest" is added as an alias for "mdevtest".  (3) Try to keep summary
 information at the end of a test below 80-characters per line.  (4) Update
 the Makefile.in so that the "clean" target removes the tcl extension built by
 item 1 above.

FossilOrigin-Name: aa5f10f21dbfb24ee54ca96bfb7b013ae29e26fec05b80681f19cc63d9face49
---
 Makefile.in         |  2 +-
 manifest            | 16 ++++++++--------
 manifest.uuid       |  2 +-
 test/tester.tcl     |  9 +++++++--
 test/testrunner.tcl | 37 +++++++++++++++++++++++++++++++++----
 5 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2377146417..cc75000033 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1626,7 +1626,7 @@ tidy:
 	rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
 	rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
 	rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
-	rm -f *.dll *.lib *.exp *.def *.pc *.vsix
+	rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl
 	rm -f sqlite3_analyzer$(TEXE)
 	rm -f mptester$(TEXE) rbu$(TEXE)	srcck1$(TEXE)
 	rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
diff --git a/manifest b/manifest
index 0d01cba7f0..2cb670f56a 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Enhance\stestrunner.tcl\sto\skeep\strack\sof\sthe\splatform\sand\sSQLite\sversion\nas\sreported\sby\sindividual\stest\scases\sand\sto\sreport\sthat\sinformation\sin\sthe\nsummary\sat\sthe\send\sof\seach\stest\srun.
-D 2024-09-05T12:06:45.482
+C Testrunner.tcl\senhancements:\s\s(1)\sAttempt\sto\sbuild\sthe\sSQLite\stcl\sextension\nif\sit\sis\snot\salready\savailable.\s\s(2)\stestrunner\starget\s"devtest"\sis\sadded\sas\nan\salias\sfor\s"mdevtest".\s\s(3)\sTry\sto\skeep\ssummary\sinformation\sat\sthe\send\sof\na\stest\sbelow\s80-characters\sper\sline.\s\s(4)\sUpdate\sthe\sMakefile.in\sso\sthat\nthe\s"clean"\starget\sremoves\sthe\stcl\sextension\sbuilt\sby\sitem\s1\sabove.
+D 2024-09-05T15:28:15.141
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in af5fbc3453b745daa68c7aa5dfdb945c09cb724971db3b783d6b5e1a62279e28
+F Makefile.in 098d9814c66d81a8bbfb3550876b7d9695a0b050c0d4680afb4931a7aa8fe7f1
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc e72a4653ea8f48efd14c7dac1e7de308a1f3cc91f905f15cbcacc680301c8f03
 F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
@@ -1714,8 +1714,8 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d1631311a16
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 1ebde7e8b57c464b9eb6ce047977c1edb46688b2ab94cc67e3cd5e4a3645ff00 x
+F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
+F test/testrunner.tcl 8b8052ef2abf673729eeeeb222961c99b3e08231635c196533aff315e3f12f2d x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf
-R a6deed6e9bd78f423240221d74d8d7b3
+P 80ebb7c7e686cd936ac834f2258f585a7004762593e0bc859ecd75d6fb0badfd
+R 83bee4b7a0d6a0c18b04c62c3e6012df
 U drh
-Z 8cf0ea19b5a0efdaca6c57466a00e96c
+Z 30dd6ec18ce8874d43e8198deb845f86
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9f0908d687..5af6554025 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80ebb7c7e686cd936ac834f2258f585a7004762593e0bc859ecd75d6fb0badfd
+aa5f10f21dbfb24ee54ca96bfb7b013ae29e26fec05b80681f19cc63d9face49
diff --git a/test/tester.tcl b/test/tester.tcl
index 164ee47f42..b5f49ebde9 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1279,10 +1279,15 @@ proc finalize_testing {} {
          out of $nTest tests"
   } else {
     set cpuinfo {}
-    if {[catch {exec hostname} hname]==0} {set cpuinfo [string trim $hname]}
+    if {[catch {exec hostname} hname]==0} {
+      regsub {\.local$} $hname {} hname
+      set cpuinfo [string trim $hname]
+    }
     append cpuinfo " $::tcl_platform(os)"
     append cpuinfo " [expr {$::tcl_platform(pointerSize)*8}]-bit"
-    append cpuinfo " [string map {E -e} $::tcl_platform(byteOrder)]"
+    if {[string match big* $::tcl_platform(byteOrder)]} {
+      append cpuinfo " [string map {E -e} $::tcl_platform(byteOrder)]"
+    }
     output2 "SQLite [sqlite3 -sourceid]"
     output2 "$nErr errors out of $nTest tests on $cpuinfo"
   }
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index cd9d0daff5..09704c03d3 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -17,8 +17,14 @@ cd $dir
 # recommend that the user build one.
 #
 proc find_interpreter {} {
+  global dir
   set interpreter [file tail [info nameofexec]]
   set rc [catch { package require sqlite3 }]
+  if {$rc} {
+    if {[file readable pkgIndex.tcl] && [catch {source pkgIndex.tcl}]==0} {
+      set rc [catch { package require sqlite3 }]
+    }
+  }
   if {$rc} {
     if { [string match -nocase testfixture* $interpreter]==0
       && [file executable ./testfixture]
@@ -31,8 +37,30 @@ proc find_interpreter {} {
     }
   }
   if {$rc} {
-    puts stderr "Failed to find tcl package sqlite3"
-    puts stderr "Run \"make testfixture\" and then try again..."
+    puts "Cannot find tcl package sqlite3: Trying to build it now..."
+    if {$::tcl_platform(platform)=="windows"} {
+      set bat [open make-tcl-extension.bat w]
+      puts $bat "nmake /f Makefile.msc tclextension"
+      close $bat
+      catch {exec -ignorestderr -- make-tcl-extension.bat}
+    } else {
+      catch {exec make tclextension}
+    }
+    if {[file readable pkgIndex.tcl] && [catch {source pkgIndex.tcl}]==0} {
+      set rc [catch { package require sqlite3 }]
+    }
+    if {$rc==0} {
+      puts "The SQLite tcl extension was successfully built and loaded."
+      puts "Run \"make tclextension-install\" to avoid having to rebuild\
+            it in the future."
+    } else {
+      puts "Unable to build the SQLite tcl extension"
+    }
+  }
+  if {$rc} {
+    puts stderr "Cannot find a working instance of the SQLite tcl extension."
+    puts stderr "Run \"make tclextension\" or \"make testfixture\" and\
+                 try again..."
     exit 1
   }
 }
@@ -1166,6 +1194,7 @@ proc add_jobs_from_cmdline {patternlist} {
       }
     }
 
+    devtest -
     mdevtest {
       set config_set {
         All-O0
@@ -1530,9 +1559,9 @@ proc run_testset {} {
      SELECT pltfm, count(*) FROM jobs WHERE pltfm IS NOT NULL
       ORDER BY 2 DESC LIMIT 1
   } {puts $pltfm}
-  puts "$totalerr errors out of $totaltest tests in about $et $pltfm"
+  puts "$totalerr errors out of $totaltest tests in $et $pltfm"
   trdb eval {
-     SELECT DISTINCT svers FROM jobs WHERE svers IS NOT NULL
+     SELECT DISTINCT substr(svers,1,80) FROM jobs WHERE svers IS NOT NULL
   } {puts $svers}
 
 }

From 6ffcdb1856fea916f9c98379e9cb57afc6db9104 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 5 Sep 2024 15:55:04 +0000
Subject: [PATCH 42/50] Update notes on build procedures in the README.md file.

FossilOrigin-Name: 1d12744fe7cc294994e53e1ffe72799d0321dd5c1ef031213f083e200918fee5
---
 README.md     | 43 +++++++++++++++++++++++++++----------------
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index c208f11ea3..ad11c453ac 100644
--- a/README.md
+++ b/README.md
@@ -103,17 +103,19 @@ script found at the root of the source tree.  Then run "make".
 
 For example:
 
-        tar xzf sqlite.tar.gz      ;#  Unpack the source tree into "sqlite"
-        mkdir bld                  ;#  Build will occur in a sibling directory
-        cd bld                     ;#  Change to the build directory
-        ../sqlite/configure        ;#  Run the configure script
-        make sqlite3               ;#  Builds the "sqlite3" command-line tool
-        make sqlite3.c             ;#  Build the "amalgamation" source file
-        make devtest               ;#  Run development tests (requires tcl-dev)
-        make releasetest           ;#  Run full release tests (requires tcl-dev)
-        make sqldiff               ;#  Builds the "sqldiff" command-line tool
-        make sqlite3_analyzer      ;#  Builds the "sqlite3_analyzer" tool (requires tcl-dev)
-        make tclextension-install  ;#  Build and install the SQLite TCL extension
+        apt install gcc make tcl-dev  ;#  Make sure you have all the necessary build tools
+        tar xzf sqlite.tar.gz         ;#  Unpack the source tree into "sqlite"
+        mkdir bld                     ;#  Build will occur in a sibling directory
+        cd bld                        ;#  Change to the build directory
+        ../sqlite/configure           ;#  Run the configure script
+        make sqlite3                  ;#  Builds the "sqlite3" command-line tool
+        make sqlite3.c                ;#  Build the "amalgamation" source file
+        make sqldiff                  ;#  Builds the "sqldiff" command-line tool
+        # Makefile targets below this point require tcl-dev
+        make tclextension-install     ;#  Build and install the SQLite TCL extension
+        make devtest                  ;#  Run development tests
+        make releasetest              ;#  Run full release tests
+        make sqlite3_analyzer         ;#  Builds the "sqlite3_analyzer" tool
 
 See the makefile for additional targets.  For debugging builds, the
 core developers typically run "configure" with options like this:
@@ -124,9 +126,12 @@ For release builds, the core developers usually do:
 
         ../sqlite/configure --enable-all
 
-Almost all makefile targets require a "tclsh" TCL interpreter
-version 8.6 or later.  The targets marked with "(requires tcl-dev)" also require
-the TCL development libraries.
+Almost all makefile targets require a "tclsh" TCL interpreter version 8.6 or
+later.  The "tclextension-install" target and the test targets that follow
+all require TCL development libraries too.  ("apt install tcl-dev").  It is
+helpful, but is not required, to install the SQLite TCL extension (the
+"tclextension-install" target) prior to running tests.  The "releasetest"
+target has additional requiremenst, such as "valgrind".
 
 On "make" command-lines, one can add "OPTIONS=..." to specify additional
 compile-time options over and above those set by ./configure.  For example,
@@ -157,15 +162,21 @@ TCL library, using a command like this:
 SQLite uses "tclsh.exe" as part of the build process, and so that
 program will need to be somewhere on your %PATH%.  SQLite itself
 does not contain any TCL code, but it does use TCL to help with the
-build process and to run tests.
+build process and to run tests.  You may need to install TCL development
+libraries in order to successfully complete some makefile targets.
+It is helpful, but is not required, to install the SQLite TCL extension
+(the "tclextension-install" target) prior to running tests.
 
 Build using Makefile.msc.  Example:
 
         nmake /f Makefile.msc sqlite3.exe
         nmake /f Makefile.msc sqlite3.c
+        nmake /f Makefile.msc sqldiff.exe
+        # Makefile targets below this point require TCL development libraries
+        nmake /f Makefile.msc tclextension-install
         nmake /f Makefile.msc devtest
         nmake /f Makefile.msc releasetest
-        nmake /f Makefile.msc tclextension-install
+        nmake /f Makefile.msc sqlite3_analyzer.exe
  
 There are many other makefile targets.  See comments in Makefile.msc for
 details.
diff --git a/manifest b/manifest
index 2cb670f56a..b5a5da924d 100644
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Testrunner.tcl\senhancements:\s\s(1)\sAttempt\sto\sbuild\sthe\sSQLite\stcl\sextension\nif\sit\sis\snot\salready\savailable.\s\s(2)\stestrunner\starget\s"devtest"\sis\sadded\sas\nan\salias\sfor\s"mdevtest".\s\s(3)\sTry\sto\skeep\ssummary\sinformation\sat\sthe\send\sof\na\stest\sbelow\s80-characters\sper\sline.\s\s(4)\sUpdate\sthe\sMakefile.in\sso\sthat\nthe\s"clean"\starget\sremoves\sthe\stcl\sextension\sbuilt\sby\sitem\s1\sabove.
-D 2024-09-05T15:28:15.141
+C Update\snotes\son\sbuild\sprocedures\sin\sthe\sREADME.md\sfile.
+D 2024-09-05T15:55:04.340
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 098d9814c66d81a8bbfb3550876b7d9695a0b050c0d4680afb4931a7aa8fe7f1
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc e72a4653ea8f48efd14c7dac1e7de308a1f3cc91f905f15cbcacc680301c8f03
-F README.md 5b678e264236788390d11991f2c0052bd73f19790173883fc56d638bcb849154
+F README.md 282d999d14bfd1dcb36652abbfba9f8dffbda083ddcdb91361459e43164a1d23
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 80ebb7c7e686cd936ac834f2258f585a7004762593e0bc859ecd75d6fb0badfd
-R 83bee4b7a0d6a0c18b04c62c3e6012df
+P aa5f10f21dbfb24ee54ca96bfb7b013ae29e26fec05b80681f19cc63d9face49
+R 7cc85ab35bb58c1a46f86590da7723ea
 U drh
-Z 30dd6ec18ce8874d43e8198deb845f86
+Z a2b02066e2e694d910978f885128ac52
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5af6554025..210827e73b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa5f10f21dbfb24ee54ca96bfb7b013ae29e26fec05b80681f19cc63d9face49
+1d12744fe7cc294994e53e1ffe72799d0321dd5c1ef031213f083e200918fee5

From 934e796e439495ab0f2655e5711c5fe6d39285b9 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 5 Sep 2024 23:22:55 +0000
Subject: [PATCH 43/50] Ensure that the WhereInfo.revMask bitmap is adjusted
 when tables are removed from the FROM clause by the Omit-Noop-Join
 optimization of [0cd82ee9a8413cf1].  Fix for the issue described by
 [forum:/forum/8a1e467e905b8d27|format post 8a1e467e905b8d27].

FossilOrigin-Name: 22ca5a2ffb89ccb5f337993b5a95e27c449c39014284156eabc33da012a8759c
---
 manifest        | 14 +++++++-------
 manifest.uuid   |  2 +-
 src/where.c     |  3 +++
 test/join2.test | 21 +++++++++++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index b5a5da924d..0a8c14d268 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\snotes\son\sbuild\sprocedures\sin\sthe\sREADME.md\sfile.
-D 2024-09-05T15:55:04.340
+C Ensure\sthat\sthe\sWhereInfo.revMask\sbitmap\sis\sadjusted\swhen\stables\sare\sremoved\nfrom\sthe\sFROM\sclause\sby\sthe\sOmit-Noop-Join\soptimization\sof\n[0cd82ee9a8413cf1].\s\sFix\sfor\sthe\sissue\sdescribed\sby\n[forum:/forum/8a1e467e905b8d27|format\spost\s8a1e467e905b8d27].
+D 2024-09-05T23:22:55.647
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -852,7 +852,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
-F src/where.c c046dd58c3410f7b7528e1e6317cb876398557bad346d568ed8562321a7d002d
+F src/where.c 079f1cf6abc086315f5c9873626b7c0537f382c55184c516b8e3d29f7a537fdc
 F src/whereInt.h a5d079c346a658b7a6e9e47bb943d021e02fa1e6aed3b964ca112112a4892192
 F src/wherecode.c 5172d647798134e7c92536ddffe7e530c393d79b5dedd648b88faf2646c65baf
 F src/whereexpr.c 44f41ae554c7572e1de1485b3169b233ee04d464b2ee5881687ede3bf07cacfa
@@ -1346,7 +1346,7 @@ F test/ioerr5.test 5984da7bf74b6540aa356f2ab0c6ae68a6d12039a3d798a9ac6a100abc17d
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/istrue.test e7f285bb70282625c258e866ce6337d4c762922f5a300e1b50f958aef6e7d9c9
 F test/join.test f7abfef3faeaf2800308872e33a57e5b6e4a2b44fb8c6b90c6068412e71a6cf4
-F test/join2.test 8561fe82ce434ac96de91544072e578dc2cadddf2d9bc9cd802f866a9b92502e
+F test/join2.test f59d63264fb24784ae9c3bc9d867eb569cd6d442da5660f8852effe5c1938c27
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test 380d12a9350f99f0cc681a4f1fea999886f18b3fe0d71a9b3065bcaead1e007f
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P aa5f10f21dbfb24ee54ca96bfb7b013ae29e26fec05b80681f19cc63d9face49
-R 7cc85ab35bb58c1a46f86590da7723ea
+P 1d12744fe7cc294994e53e1ffe72799d0321dd5c1ef031213f083e200918fee5
+R 45d88f5375170588d0b1bd314eace7a3
 U drh
-Z a2b02066e2e694d910978f885128ac52
+Z 4179122ae9403ba759b59f6aa6b2df32
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 210827e73b..dc2d1cd140 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1d12744fe7cc294994e53e1ffe72799d0321dd5c1ef031213f083e200918fee5
+22ca5a2ffb89ccb5f337993b5a95e27c449c39014284156eabc33da012a8759c
diff --git a/src/where.c b/src/where.c
index 2b835009db..7ca4f533f0 100644
--- a/src/where.c
+++ b/src/where.c
@@ -6199,6 +6199,7 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
     WhereTerm *pTerm, *pEnd;
     SrcItem *pItem;
     WhereLoop *pLoop;
+    Bitmask m1;
     pLoop = pWInfo->a[i].pWLoop;
     pItem = &pWInfo->pTabList->a[pLoop->iTab];
     if( (pItem->fg.jointype & (JT_LEFT|JT_RIGHT))!=JT_LEFT ) continue;
@@ -6226,6 +6227,8 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
     }
     if( pTerm<pEnd ) continue;
     WHERETRACE(0xffffffff, ("-> drop loop %c not used\n", pLoop->cId));
+    m1 = MASKBIT(i)-1;
+    pWInfo->revMask = (m1 & pWInfo->revMask) | ((pWInfo->revMask>>1) & ~m1);
     notReady &= ~pLoop->maskSelf;
     for(pTerm=pWInfo->sWC.a; pTerm<pEnd; pTerm++){
       if( (pTerm->prereqAll & pLoop->maskSelf)!=0 ){
diff --git a/test/join2.test b/test/join2.test
index 15e76f965d..6f2fe1d770 100644
--- a/test/join2.test
+++ b/test/join2.test
@@ -428,4 +428,25 @@ do_eqp_test 12.3 {
   `--SEARCH t1 USING INTEGER PRIMARY KEY (rowid=?) LEFT-JOIN
 }
 
+# 2024-09-05 https://sqlite.org/forum/forumpost/8a1e467e905b8d27
+# When performing the Omit-Noop-Join optimization, if FROM clause terms
+# to the right of the omitted join have the reverse-order bit set in the
+# WhereInfo.revMask bitmask, those bits need to be shifted to account
+# for the omitted join.
+#
+reset_db
+do_execsql_test 13.0 {
+  CREATE TABLE t1(a1 INTEGER PRIMARY KEY, b1 INT);
+  CREATE TABLE t2(c2 INT, d2 INTEGER PRIMARY KEY);
+  CREATE TABLE t3(e3 INTEGER PRIMARY KEY);
+  INSERT INTO t1 VALUES(33,0);
+  INSERT INTO t2 VALUES(33,1),(33,2);
+}
+do_execsql_test 13.1 {
+  SELECT t1.a1, t2.d2
+    FROM (t1 LEFT JOIN t3 ON t3.e3=t1.b1) JOIN t2 ON t2.c2=t1.a1
+   WHERE t1.a1=33
+   ORDER BY t2.d2 DESC;
+} {33 2 33 1}
+
 finish_test

From dc181d41d56141fa151257ffd2892b7fdc3ba2b0 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 5 Sep 2024 23:40:13 +0000
Subject: [PATCH 44/50] Fix a testrunner status reporting problem introduced by
 [aa5f10f21dbfb24e].

FossilOrigin-Name: d20c65c3b4256a662ebf7ed024b7b7adaceca90358f58111dc645da322000794
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 0a8c14d268..5ffa57feba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sWhereInfo.revMask\sbitmap\sis\sadjusted\swhen\stables\sare\sremoved\nfrom\sthe\sFROM\sclause\sby\sthe\sOmit-Noop-Join\soptimization\sof\n[0cd82ee9a8413cf1].\s\sFix\sfor\sthe\sissue\sdescribed\sby\n[forum:/forum/8a1e467e905b8d27|format\spost\s8a1e467e905b8d27].
-D 2024-09-05T23:22:55.647
+C Fix\sa\stestrunner\sstatus\sreporting\sproblem\sintroduced\sby\s[aa5f10f21dbfb24e].
+D 2024-09-05T23:40:13.439
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
-F test/testrunner.tcl 8b8052ef2abf673729eeeeb222961c99b3e08231635c196533aff315e3f12f2d x
+F test/testrunner.tcl a59e911e3732ba4d6b66e310f72d9599eb0392d3de659a525c519ba755cbf3e1 x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1d12744fe7cc294994e53e1ffe72799d0321dd5c1ef031213f083e200918fee5
-R 45d88f5375170588d0b1bd314eace7a3
+P 22ca5a2ffb89ccb5f337993b5a95e27c449c39014284156eabc33da012a8759c
+R bc86dd135008dded1df1caf42383464b
 U drh
-Z 4179122ae9403ba759b59f6aa6b2df32
+Z 5f358c18a2ed0f553bb9c3eac9d42cd6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dc2d1cd140..c0a2eed54c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22ca5a2ffb89ccb5f337993b5a95e27c449c39014284156eabc33da012a8759c
+d20c65c3b4256a662ebf7ed024b7b7adaceca90358f58111dc645da322000794
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 09704c03d3..d28bdd4fba 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -1561,8 +1561,8 @@ proc run_testset {} {
   } {puts $pltfm}
   puts "$totalerr errors out of $totaltest tests in $et $pltfm"
   trdb eval {
-     SELECT DISTINCT substr(svers,1,80) FROM jobs WHERE svers IS NOT NULL
-  } {puts $svers}
+     SELECT DISTINCT substr(svers,1,80) as v1 FROM jobs WHERE svers IS NOT NULL
+  } {puts $v1}
 
 }
 

From 56a048054078e316ddb057057c323116b82d8b46 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 6 Sep 2024 09:49:13 +0000
Subject: [PATCH 45/50] Clarification and simplification to the README.md file
 and to the instructions for building on Windows.

FossilOrigin-Name: f69ef1a37b2778bdf73ee7e3b3edd74f7344ab8e5eedbedc22203c782e521f5b
---
 README.md                  | 27 +++++++++++++++------------
 doc/compile-for-windows.md | 13 ++++++++++++-
 manifest                   | 14 +++++++-------
 manifest.uuid              |  2 +-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index ad11c453ac..689b52dabd 100644
--- a/README.md
+++ b/README.md
@@ -73,23 +73,26 @@ archives or [SQLite archives](https://sqlite.org/cli.html#sqlar) as follows:
      then click on the "Tarball" or "ZIP Archive" links on the information
      page.
 
-To access sources directly using Fossil, first install Fossil version 2.0 or later.
-Source tarballs and precompiled binaries available
-[here](https://www.fossil-scm.org/home/uv/download.html).  Fossil is
+To access sources directly using [Fossil](https://fossil-scm.org/home),
+first install Fossil version 2.0 or later.
+Source tarballs and precompiled binaries available at
+<https://fossil-scm.org/home/uv/download.html>.  Fossil is
 a stand-alone program.  To install, simply download or build the single
 executable file and put that file someplace on your $PATH.
 Then run commands like this:
 
-        mkdir -p ~/sqlite ~/Fossils
+        mkdir -p ~/sqlite
         cd ~/sqlite
-        fossil clone https://www.sqlite.org/src ~/Fossils/sqlite.fossil
-        fossil open ~/Fossils/sqlite.fossil
+        fossil open https://sqlite.org/src
 
-After setting up a repository using the steps above, you can do
-bandwidth-efficient updates to the latest version using:
+The "fossil open" command will take two or three minutes.  Afterwards,
+you can do fast, bandwidth-efficient updates to the whatever versions
+of SQLite you like.  Some examples:
 
-        fossil update trunk   ;# latest trunk check-in
-        fossil update release ;# latest official release
+        fossil update trunk             ;# latest trunk check-in
+        fossil update release           ;# latest official release
+        fossil update trunk:2024-01-01  ;# First trunk check-in after 2024-01-01
+        fossil update version-3.39.0    ;# Version 3.39.0
 
 Or type "fossil ui" to get a web-based user interface.
 
@@ -148,7 +151,7 @@ show what changes are needed.
 
 ## Compiling for Windows Using MSVC
 
-On Windows, all applicable build products can be compiled with MSVC.
+On Windows, everything can be compiled with MSVC.
 You will also need a working installation of TCL.
 See the [compile-for-windows.md](doc/compile-for-windows.md) document for
 additional information about how to install MSVC and TCL and configure your
@@ -383,7 +386,7 @@ implementation.  It will not be the easiest library in the world to hack.
   *  **VERSION**, **manifest**, and **manifest.uuid** - These files define
      the current SQLite version number.  The "VERSION" file is human generated,
      but the "manifest" and "manifest.uuid" files are automatically generated
-     by the [Fossil version control system](https://fossil-scm/).
+     by the [Fossil version control system](https://fossil-scm.org/).
 
 There are many other source files.  Each has a succinct header comment that
 describes its purpose and role within the larger system.
diff --git a/doc/compile-for-windows.md b/doc/compile-for-windows.md
index 5e6a2d1a25..1627188acd 100644
--- a/doc/compile-for-windows.md
+++ b/doc/compile-for-windows.md
@@ -57,11 +57,22 @@ canonical source on a new Windows 11 PC, as of 2023-11-01:
       <ul>
       <li>  `nmake /f makefile.msc`
       <li>  `nmake /f makefile.msc sqlite3.c`
+      <li>  `nmake /f makefile.msc sqlite3.exe`
+      <li>  `nmake /f makefile.msc sqldiff.exe`
+      <li>  `nmake /f makefile.msc tclextension-install`
       <li>  `nmake /f makefile.msc devtest`
       <li>  `nmake /f makefile.msc releasetest`
-      <li>  `nmake /f makefile.msc sqlite3.exe`
+      <li>  `nmake /f makefile.msc sqlite3_analyzer.exe`
       </ul>
 
+      It is not required that you run the "tclextension-install" target prior to
+      running tests.  However, the tests will run more smoothly if you do.
+      The version of SQLite used for the TCL extension does *not* need to
+      correspond to the version of SQLite under test.  So you can install the
+      SQLite TCL extension once, and then use it to test many different versions
+      of SQLite.
+
+
   7.  For a debugging build of the CLI, where the ".treetrace" and ".wheretrace"
       commands work, add the DEBUG=3 argument to nmake.  Like this:
       <ul>
diff --git a/manifest b/manifest
index 5ffa57feba..f6017ee1ad 100644
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Fix\sa\stestrunner\sstatus\sreporting\sproblem\sintroduced\sby\s[aa5f10f21dbfb24e].
-D 2024-09-05T23:40:13.439
+C Clarification\sand\ssimplification\sto\sthe\sREADME.md\sfile\sand\sto\sthe\sinstructions\nfor\sbuilding\son\sWindows.
+D 2024-09-06T09:49:13.510
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 098d9814c66d81a8bbfb3550876b7d9695a0b050c0d4680afb4931a7aa8fe7f1
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc e72a4653ea8f48efd14c7dac1e7de308a1f3cc91f905f15cbcacc680301c8f03
-F README.md 282d999d14bfd1dcb36652abbfba9f8dffbda083ddcdb91361459e43164a1d23
+F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -39,7 +39,7 @@ F configure 49523f0a070b583cea040d26eff53a65fb0893eca4663b1343a4d5a9a964da53 x
 F configure.ac a100ebf7a07f5dedd319ef547dd467d1676ed059b85a7877aa9c44ac309f7000
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
-F doc/compile-for-windows.md e8635eea9153dcd6a51fd2740666ebc4492b3813cb1ac31cd8e99150df91762d
+F doc/compile-for-windows.md 4d4bfafda42a7a33f166d23aed4db1bb4ea1e5751595a5cced2bad349fd14652
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
 F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b
 F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 22ca5a2ffb89ccb5f337993b5a95e27c449c39014284156eabc33da012a8759c
-R bc86dd135008dded1df1caf42383464b
+P d20c65c3b4256a662ebf7ed024b7b7adaceca90358f58111dc645da322000794
+R e0122c673835ce2d6d2df201e5b1e575
 U drh
-Z 5f358c18a2ed0f553bb9c3eac9d42cd6
+Z 474793855763ef2064fdff2fee5b0897
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c0a2eed54c..f130b71200 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d20c65c3b4256a662ebf7ed024b7b7adaceca90358f58111dc645da322000794
+f69ef1a37b2778bdf73ee7e3b3edd74f7344ab8e5eedbedc22203c782e521f5b

From c4e84b72958d46aad7a08e77b6e8744e8e3e88ab Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 6 Sep 2024 10:35:36 +0000
Subject: [PATCH 46/50] A testcase() macro added to help ensure that the fix to
 the omit-noop-join optimization from yesterday does not regress.

FossilOrigin-Name: 224628b1039b996499e0d806fc0215f175da6f1059eb1b9ac491ac11126971ab
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/where.c   |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index f6017ee1ad..d0c4ee56d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarification\sand\ssimplification\sto\sthe\sREADME.md\sfile\sand\sto\sthe\sinstructions\nfor\sbuilding\son\sWindows.
-D 2024-09-06T09:49:13.510
+C A\stestcase()\smacro\sadded\sto\shelp\sensure\sthat\sthe\sfix\sto\sthe\somit-noop-join\noptimization\sfrom\syesterday\sdoes\snot\sregress.
+D 2024-09-06T10:35:36.196
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -852,7 +852,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
-F src/where.c 079f1cf6abc086315f5c9873626b7c0537f382c55184c516b8e3d29f7a537fdc
+F src/where.c 7fb55836eb7fd07f0a0d8400c50619fc02cda1f46a617cfb003c2990f040193d
 F src/whereInt.h a5d079c346a658b7a6e9e47bb943d021e02fa1e6aed3b964ca112112a4892192
 F src/wherecode.c 5172d647798134e7c92536ddffe7e530c393d79b5dedd648b88faf2646c65baf
 F src/whereexpr.c 44f41ae554c7572e1de1485b3169b233ee04d464b2ee5881687ede3bf07cacfa
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d20c65c3b4256a662ebf7ed024b7b7adaceca90358f58111dc645da322000794
-R e0122c673835ce2d6d2df201e5b1e575
+P f69ef1a37b2778bdf73ee7e3b3edd74f7344ab8e5eedbedc22203c782e521f5b
+R a9f753c3499efd243abe359303301f78
 U drh
-Z 474793855763ef2064fdff2fee5b0897
+Z a70e5af6a81ae35c981b5946f602f67c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f130b71200..b195d89eaa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f69ef1a37b2778bdf73ee7e3b3edd74f7344ab8e5eedbedc22203c782e521f5b
+224628b1039b996499e0d806fc0215f175da6f1059eb1b9ac491ac11126971ab
diff --git a/src/where.c b/src/where.c
index 7ca4f533f0..35da4caa6e 100644
--- a/src/where.c
+++ b/src/where.c
@@ -6226,8 +6226,9 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
       }
     }
     if( pTerm<pEnd ) continue;
-    WHERETRACE(0xffffffff, ("-> drop loop %c not used\n", pLoop->cId));
+    WHERETRACE(0xffffffff,("-> omit unused FROM-clause term %c\n",pLoop->cId));
     m1 = MASKBIT(i)-1;
+    testcase( ((pWInfo->revMask>>1) & ~m1)!=0 );
     pWInfo->revMask = (m1 & pWInfo->revMask) | ((pWInfo->revMask>>1) & ~m1);
     notReady &= ~pLoop->maskSelf;
     for(pTerm=pWInfo->sWC.a; pTerm<pEnd; pTerm++){

From deb6a60a848cf8622e5508b8c1b66ef9e3848955 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 6 Sep 2024 11:21:53 +0000
Subject: [PATCH 47/50] Fix harmless compiler warnings.

FossilOrigin-Name: 60fb8ee153ec293b6b3a4170dafa305e4c16af575aced72daef46116d8dc2bb6
---
 ext/rbu/sqlite3rbu.c       | 41 ++++++++++++++++++++++++++++++++------
 ext/session/test_session.c |  8 ++++----
 manifest                   | 20 +++++++++----------
 manifest.uuid              |  2 +-
 src/test1.c                |  2 +-
 test/fuzzcheck.c           |  7 ++++---
 test/fuzzinvariants.c      |  7 ++++---
 7 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c
index feb7695d66..8e29ab820f 100644
--- a/ext/rbu/sqlite3rbu.c
+++ b/ext/rbu/sqlite3rbu.c
@@ -336,6 +336,27 @@ struct RbuFrame {
   u32 iWalFrame;
 };
 
+#ifndef UNUSED_PARAMETER
+/*
+** The following macros are used to suppress compiler warnings and to
+** make it clear to human readers when a function parameter is deliberately
+** left unused within the body of a function. This usually happens when
+** a function is called via a function pointer. For example the
+** implementation of an SQL aggregate step callback may not use the
+** parameter indicating the number of arguments passed to the aggregate,
+** if it knows that this is enforced elsewhere.
+**
+** When a function parameter is not used at all within the body of a function,
+** it is generally named "NotUsed" or "NotUsed2" to make things even clearer.
+** However, these macros may also be used to suppress warnings related to
+** parameters that may or may not be used depending on compilation options.
+** For example those parameters only used in assert() statements. In these
+** cases the parameters are named as per the usual conventions.
+*/
+#define UNUSED_PARAMETER(x) (void)(x)
+#define UNUSED_PARAMETER2(x,y) UNUSED_PARAMETER(x),UNUSED_PARAMETER(y)
+#endif
+
 /*
 ** RBU handle.
 **
@@ -387,7 +408,7 @@ struct sqlite3rbu {
   int rc;                         /* Value returned by last rbu_step() call */
   char *zErrmsg;                  /* Error message if rc!=SQLITE_OK */
   int nStep;                      /* Rows processed for current object */
-  int nProgress;                  /* Rows processed for all objects */
+  sqlite3_int64 nProgress;        /* Rows processed for all objects */
   RbuObjIter objiter;             /* Iterator for skipping through tbl/idx */
   const char *zVfsName;           /* Name of automatically created rbu vfs */
   rbu_file *pTargetFd;            /* File handle open on target db */
@@ -504,7 +525,7 @@ static unsigned int rbuDeltaGetInt(const char **pz, int *pLen){
      v = (v<<6) + c;
   }
   z--;
-  *pLen -= z - zStart;
+  *pLen -= (int)(z - zStart);
   *pz = (char*)z;
   return v;
 }
@@ -689,6 +710,7 @@ static void rbuFossilDeltaFunc(
   char *aOut;
 
   assert( argc==2 );
+  UNUSED_PARAMETER(argc);
 
   nOrig = sqlite3_value_bytes(argv[0]);
   aOrig = (const char*)sqlite3_value_blob(argv[0]);
@@ -2268,13 +2290,13 @@ static char *rbuObjIterGetIndexWhere(sqlite3rbu *p, RbuObjIter *pIter){
           else if( c==')' ){
             nParen--;
             if( nParen==0 ){
-              int nSpan = &zSql[i] - pIter->aIdxCol[iIdxCol].zSpan;
+              int nSpan = (int)(&zSql[i] - pIter->aIdxCol[iIdxCol].zSpan);
               pIter->aIdxCol[iIdxCol++].nSpan = nSpan;
               i++;
               break;
             }
           }else if( c==',' && nParen==1 ){
-            int nSpan = &zSql[i] - pIter->aIdxCol[iIdxCol].zSpan;
+            int nSpan = (int)(&zSql[i] - pIter->aIdxCol[iIdxCol].zSpan);
             pIter->aIdxCol[iIdxCol++].nSpan = nSpan;
             pIter->aIdxCol[iIdxCol].zSpan = &zSql[i+1];
           }else if( c=='"' || c=='\'' || c=='`' ){
@@ -2964,6 +2986,8 @@ static void rbuFileSuffix3(const char *zBase, char *z){
     for(i=sz-1; i>0 && z[i]!='/' && z[i]!='.'; i--){}
     if( z[i]=='.' && sz>i+4 ) memmove(&z[i+1], &z[sz-3], 4);
   }
+#else
+  UNUSED_PARAMETER2(zBase,z);
 #endif
 }
 
@@ -3548,7 +3572,7 @@ static void rbuSaveState(sqlite3rbu *p, int eStage){
           "(%d, %Q), "
           "(%d, %Q), "
           "(%d, %d), "
-          "(%d, %d), "
+          "(%d, %lld), "
           "(%d, %lld), "
           "(%d, %lld), "
           "(%d, %lld), "
@@ -3906,6 +3930,7 @@ static void rbuIndexCntFunc(
   sqlite3 *db = (rbuIsVacuum(p) ? p->dbRbu : p->dbMain);
 
   assert( nVal==1 );
+  UNUSED_PARAMETER(nVal);
   
   rc = prepareFreeAndCollectError(db, &pStmt, &zErrmsg, 
       sqlite3_mprintf("SELECT count(*) FROM sqlite_schema "
@@ -4181,7 +4206,7 @@ sqlite3rbu *sqlite3rbu_vacuum(
 ){
   if( zTarget==0 ){ return rbuMisuseError(); }
   if( zState ){
-    int n = strlen(zState);
+    size_t n = strlen(zState);
     if( n>=7 && 0==memcmp("-vactmp", &zState[n-7], 7) ){
       return rbuMisuseError();
     }
@@ -4398,6 +4423,7 @@ int sqlite3rbu_savestate(sqlite3rbu *p){
 */
 static int xDefaultRename(void *pArg, const char *zOld, const char *zNew){
   int rc = SQLITE_OK;
+  UNUSED_PARAMETER(pArg);
 #if defined(_WIN32_WCE)
   {
     LPWSTR zWideOld;
@@ -5302,6 +5328,9 @@ static int rbuVfsCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
 ** No-op.
 */
 static int rbuVfsGetLastError(sqlite3_vfs *pVfs, int a, char *b){
+  UNUSED_PARAMETER(pVfs);
+  UNUSED_PARAMETER(a
);
+  UNUSED_PARAMETER(b);
   return 0;
 }
 
diff --git a/ext/session/test_session.c b/ext/session/test_session.c
index 79ad000e18..29aeadf537 100644
--- a/ext/session/test_session.c
+++ b/ext/session/test_session.c
@@ -383,10 +383,10 @@ static int SQLITE_TCLAPI test_session_cmd(
         { "rowid", SQLITE_SESSION_OBJCONFIG_ROWID },
         { 0, 0 }
       };
-      size_t sz = sizeof(aOpt[0]);
+      int sz = (int)sizeof(aOpt[0]);
 
       int iArg;
-      int iOpt;
+      Tcl_Size iOpt;
       if( Tcl_GetIndexFromObjStruct(interp,objv[2],aOpt,sz,"option",0,&iOpt) ){
         return TCL_ERROR;
       }
@@ -803,7 +803,7 @@ static int SQLITE_TCLAPI testSqlite3changesetApply(
   if( bV2 ){
     while( objc>1 ){
       const char *z1 = Tcl_GetString(objv[1]);
-      int n = strlen(z1);
+      int n = (int)strlen(z1);
       if( n>3 && n<=12 && 0==sqlite3_strnicmp("-nosavepoint", z1, n) ){
         flags |= SQLITE_CHANGESETAPPLY_NOSAVEPOINT;
       }
@@ -1119,7 +1119,7 @@ static int SQLITE_TCLAPI test_sqlite3session_foreach(
 
   while( objc>1 ){
     char *zOpt = Tcl_GetString(objv[1]);
-    int nOpt = strlen(zOpt);
+    int nOpt = (int)strlen(zOpt);
     if( zOpt[0]!='-' ) break;
     if( nOpt<=7 && 0==sqlite3_strnicmp(zOpt, "-invert", nOpt) ){
       isInvert = 1;
diff --git a/manifest b/manifest
index d0c4ee56d5..238ef2d4dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\stestcase()\smacro\sadded\sto\shelp\sensure\sthat\sthe\sfix\sto\sthe\somit-noop-join\noptimization\sfrom\syesterday\sdoes\snot\sregress.
-D 2024-09-06T10:35:36.196
+C Fix\sharmless\scompiler\swarnings.
+D 2024-09-06T11:21:53.173
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/rbu/rbuvacuum.test 542561741ff2b262e3694bc6012b44694ee62c545845319a06f3237
 F ext/rbu/rbuvacuum2.test ae097d04feb041446a74fac94b24bffeb3fdd60e32b848c5611e507ab702b81b
 F ext/rbu/rbuvacuum3.test 3ce42695fdf21aaa3499e857d7d4253bc499ad759bcd6c9362042c13cd37d8de
 F ext/rbu/rbuvacuum4.test ffccd22f67e2d0b380d2889685742159dfe0d19a3880ca3d2d1d69eefaebb205
-F ext/rbu/sqlite3rbu.c 4a3376c0fb9a844a799ac529fb81260523f6b13c9f629bc270c632dbae5fc1f8
+F ext/rbu/sqlite3rbu.c d90c79c2e9998e0f54da86d28c8433db7997864279fcfce02592e0838c8ce71d
 F ext/rbu/sqlite3rbu.h 9d923eb135c5d04aa6afd7c39ca47b0d1d0707c100e02f19fdde6a494e414304
 F ext/rbu/test_rbu.c b9727c3394307d058e806c1da0f8bb7b24daf3c6bb94cb10cca88ea4d5c806c0
 F ext/recover/dbdata.c 5295f4f922b60d7035b6b9fd5846b13071b9d97ed7fad8496837bb7640d24771
@@ -595,7 +595,7 @@ F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544
 F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
 F ext/session/sqlite3session.c c7473aafbd88f796391a8c25aa90975a8f3729ab7f4f8cf74ab9d3b014e10abe
 F ext/session/sqlite3session.h 683ccbf16e2c2521661fc4c1cf918ce57002039efbcabcd8097fa4bca569104b
-F ext/session/test_session.c 6acbe67db80ab0806147eb62a12f9e3a44930f4a740b68b0a4340dddda2c10d7
+F ext/session/test_session.c aa29abdcc9011ac02f4fa38e8ede226106eaeee7c3ea7d8b2b999a124e0c368c
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt ca7e9ee82ca4e1c1744295f8184dd70edfae1992865d26c64303f539eb6c084c
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
@@ -777,7 +777,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c c6888598f08dee3d9112a38ef42c8f5c89ca7f3190f4694744d0b84250f4bf8c
 F src/tclsqlite.h c6af51f31a2b2172d674608763a4b98fdf5cd587e4025053e546fb8077757262
-F src/test1.c 3f18399557d954bc85f4564aec8ea1777d2161a81d98a3ff6c9e9046bf3554c1
+F src/test1.c 8d7cd219c004cd2ced60659ebf045025cc5c16ce19d12459589dacd4310f7f07
 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
 F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@ -1267,7 +1267,7 @@ F test/fuzz3.test 70ba57260364b83e964707b9d4b5625284239768ab907dd387c740c0370ce3
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 20be6c96bd0da2e91d25f089a037c1b3f8142211c97104f20629bf15610019e6
+F test/fuzzcheck.c 3b8b39e3c0c88422c51ef0a93481d3d528fb370668344bf0ae4c87629c18b021
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1279,7 +1279,7 @@ F test/fuzzdata8.db 4a53b6d077c6a5c23b609d8d3ac66996fa55ba3f8d02f9b6efdd0214a767
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c 81167c9a7e82c0539a1d704aeb3384046d01f4108cda160a2447cb2a149d6362
+F test/fuzzinvariants.c 3de49c7b33f5641b67edc2496328a49af029738e92c8499fafbf8618ad42f68d
 F test/gcfault.test 4ea410ac161e685f17b19e1f606f58514a2850e806c65b846d05f60d436c5b0d
 F test/gencol1.test e169bdfa11c7ed5e9f322a98a7db3afe9e66235750b68c923efee8e1876b46ec
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f69ef1a37b2778bdf73ee7e3b3edd74f7344ab8e5eedbedc22203c782e521f5b
-R a9f753c3499efd243abe359303301f78
+P 224628b1039b996499e0d806fc0215f175da6f1059eb1b9ac491ac11126971ab
+R 4ffcc50319bb317830ac49a5c5529b0f
 U drh
-Z a70e5af6a81ae35c981b5946f602f67c
+Z 1e521328c9a1b05b589836828e6bb245
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b195d89eaa..7d403270b8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-224628b1039b996499e0d806fc0215f175da6f1059eb1b9ac491ac11126971ab
+60fb8ee153ec293b6b3a4170dafa305e4c16af575aced72daef46116d8dc2bb6
diff --git a/src/test1.c b/src/test1.c
index 177091a0e1..38ea6229ee 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -2343,7 +2343,7 @@ static int SQLITE_TCLAPI test_stmt_scanstatus(
     }
     for(ii=0; ii<(int)nFlag; ii++){
       int iVal = 0;
-      int res = Tcl_GetIndexFromObjStruct(
+      res = Tcl_GetIndexFromObjStruct(
           interp, aFlag[ii], aTbl, sizeof(aTbl[0]), "flag", 0, &iVal
       );
       if( res ) return TCL_ERROR;
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index ea0d949b5b..f81e0982d9 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -1045,10 +1045,11 @@ static void bindDebugParameters(sqlite3_stmt *pStmt){
       sqlite3_bind_int(pStmt, i+1, atoi(&zVar[5]));
     }else
     if( strncmp(zVar, "$text_", 6)==0 ){
-      char *zBuf = sqlite3_malloc64( strlen(zVar)-5 );
+      size_t szVar = strlen(zVar);
+      char *zBuf = sqlite3_malloc64( szVar-5 );
       if( zBuf ){
-        memcpy(zBuf, &zVar[6], strlen(zVar)-5);
-        sqlite3_bind_text64(pStmt, i+1, zBuf, -1, sqlite3_free, SQLITE_UTF8);
+        memcpy(zBuf, &zVar[6], szVar-5);
+        sqlite3_bind_text64(pStmt, i, zBuf, szVar-6, sqlite3_free, SQLITE_UTF8);
       }
     }
   }
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index 36121963f5..2f09c43ab6 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -54,10 +54,11 @@ static void bindDebugParameters(sqlite3_stmt *pStmt){
       sqlite3_bind_int(pStmt, i+1, atoi(&zVar[5]));
     }else
     if( strncmp(zVar, "$text_", 6)==0 ){
-      char *zBuf = sqlite3_malloc64( strlen(zVar)-5 );
+      size_t szVar = strlen(zVar);
+      char *zBuf = sqlite3_malloc64( szVar-5 );
       if( zBuf ){
-        memcpy(zBuf, &zVar[6], strlen(zVar)-5);
-        sqlite3_bind_text64(pStmt, i+1, zBuf, -1, sqlite3_free, SQLITE_UTF8);
+        memcpy(zBuf, &zVar[6], szVar-5);
+        sqlite3_bind_text64(pStmt, i, zBuf, szVar-6, sqlite3_free, SQLITE_UTF8);
       }
     }
   }

From c43d16d69ab2ee9eb4375d8e2e6892b5e58c5c4b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 6 Sep 2024 13:13:25 +0000
Subject: [PATCH 48/50] In testrunner.tcl, correctly capture and display
 information about the system under test:  hostname, OS, pointer size,
 byte-order.

FossilOrigin-Name: ec75cfc5d4b69e4aed64d17748cac15cd62a759a1cbe7feaa4580ad8346b0b95
---
 manifest            | 12 ++++++------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifest b/manifest
index 238ef2d4dc..63f65d36d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2024-09-06T11:21:53.173
+C In\stestrunner.tcl,\scorrectly\scapture\sand\sdisplay\sinformation\sabout\sthe\nsystem\sunder\stest:\s\shostname,\sOS,\spointer\ssize,\sbyte-order.
+D 2024-09-06T13:13:25.545
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
-F test/testrunner.tcl a59e911e3732ba4d6b66e310f72d9599eb0392d3de659a525c519ba755cbf3e1 x
+F test/testrunner.tcl 3dd75b45593d2afa2e3bca76121297a9f163bebb98474b13536f326829a71db1 x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 224628b1039b996499e0d806fc0215f175da6f1059eb1b9ac491ac11126971ab
-R 4ffcc50319bb317830ac49a5c5529b0f
+P 60fb8ee153ec293b6b3a4170dafa305e4c16af575aced72daef46116d8dc2bb6
+R 10b53f0d3edd4deb6d00308ae86e15b9
 U drh
-Z 1e521328c9a1b05b589836828e6bb245
+Z 1062f5bb698948cf0174718b6a1b925f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7d403270b8..e8fed7784f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60fb8ee153ec293b6b3a4170dafa305e4c16af575aced72daef46116d8dc2bb6
+ec75cfc5d4b69e4aed64d17748cac15cd62a759a1cbe7feaa4580ad8346b0b95
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index d28bdd4fba..a4a71a85e0 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -1282,12 +1282,11 @@ proc mark_job_as_finished {jobid output state endtm} {
   set ntest 1
   set nerr 0
   if {$endtm>0} {
-    if {[regexp {\y(\d+) errors out of (\d+) tests} $output all a b]} {
+    set re {\y(\d+) errors out of (\d+) tests( on [^\n]+\n)?}
+    if {[regexp $re $output all a b pltfm]} {
       set nerr $a
       set ntest $b
     }
-    regexp {\y\d+ errors out of \d+ tests (on [^\n]+-bit \S+-endian)} \
-         $output all pltfm
     regexp {\ySQLite \d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [0-9a-fA-F]+} \
          $output svers
   }
@@ -1298,6 +1297,7 @@ proc mark_job_as_finished {jobid output state endtm} {
     } else {
       set childstate ready
     }
+    if {[info exists pltfm]} {set pltfm [string trim $pltfm]}
     trdb eval {
       UPDATE jobs 
         SET output=$output, state=$state, endtime=$endtm,
@@ -1558,10 +1558,10 @@ proc run_testset {} {
   trdb eval {
      SELECT pltfm, count(*) FROM jobs WHERE pltfm IS NOT NULL
       ORDER BY 2 DESC LIMIT 1
-  } {puts $pltfm}
+  } break
   puts "$totalerr errors out of $totaltest tests in $et $pltfm"
   trdb eval {
-     SELECT DISTINCT substr(svers,1,80) as v1 FROM jobs WHERE svers IS NOT NULL
+     SELECT DISTINCT substr(svers,1,79) as v1 FROM jobs WHERE svers IS NOT NULL
   } {puts $v1}
 
 }

From bc976303137dd905dc610910d7154908d89c4159 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 6 Sep 2024 14:01:48 +0000
Subject: [PATCH 49/50] Fix a harmless stray carriage-return character.

FossilOrigin-Name: 84a6c5f975de36ba93b888e01cc5188717b5644ab8384beb8fd8906bdfc8e227
---
 ext/rbu/sqlite3rbu.c |  2 +-
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c
index 8e29ab820f..36688925d6 100644
--- a/ext/rbu/sqlite3rbu.c
+++ b/ext/rbu/sqlite3rbu.c
@@ -5329,7 +5329,7 @@ static int rbuVfsCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
 */
 static int rbuVfsGetLastError(sqlite3_vfs *pVfs, int a, char *b){
   UNUSED_PARAMETER(pVfs);
-  UNUSED_PARAMETER(a
);
+  UNUSED_PARAMETER(a);
   UNUSED_PARAMETER(b);
   return 0;
 }
diff --git a/manifest b/manifest
index 63f65d36d5..b721afee72 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\stestrunner.tcl,\scorrectly\scapture\sand\sdisplay\sinformation\sabout\sthe\nsystem\sunder\stest:\s\shostname,\sOS,\spointer\ssize,\sbyte-order.
-D 2024-09-06T13:13:25.545
+C Fix\sa\sharmless\sstray\scarriage-return\scharacter.
+D 2024-09-06T14:01:48.949
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F ext/rbu/rbuvacuum.test 542561741ff2b262e3694bc6012b44694ee62c545845319a06f3237
 F ext/rbu/rbuvacuum2.test ae097d04feb041446a74fac94b24bffeb3fdd60e32b848c5611e507ab702b81b
 F ext/rbu/rbuvacuum3.test 3ce42695fdf21aaa3499e857d7d4253bc499ad759bcd6c9362042c13cd37d8de
 F ext/rbu/rbuvacuum4.test ffccd22f67e2d0b380d2889685742159dfe0d19a3880ca3d2d1d69eefaebb205
-F ext/rbu/sqlite3rbu.c d90c79c2e9998e0f54da86d28c8433db7997864279fcfce02592e0838c8ce71d
+F ext/rbu/sqlite3rbu.c c07817e89477b8fc286ab6ed87da5bc82fc3490bbbe9e9b22eb2d900e81ee5dc
 F ext/rbu/sqlite3rbu.h 9d923eb135c5d04aa6afd7c39ca47b0d1d0707c100e02f19fdde6a494e414304
 F ext/rbu/test_rbu.c b9727c3394307d058e806c1da0f8bb7b24daf3c6bb94cb10cca88ea4d5c806c0
 F ext/recover/dbdata.c 5295f4f922b60d7035b6b9fd5846b13071b9d97ed7fad8496837bb7640d24771
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 60fb8ee153ec293b6b3a4170dafa305e4c16af575aced72daef46116d8dc2bb6
-R 10b53f0d3edd4deb6d00308ae86e15b9
+P ec75cfc5d4b69e4aed64d17748cac15cd62a759a1cbe7feaa4580ad8346b0b95
+R fff388cd7307c5b0da6a2a2532ba0d3f
 U drh
-Z 1062f5bb698948cf0174718b6a1b925f
+Z 8d9185ba5e8e9cd8d975e704cf12a0ed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e8fed7784f..104d10f3e6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec75cfc5d4b69e4aed64d17748cac15cd62a759a1cbe7feaa4580ad8346b0b95
+84a6c5f975de36ba93b888e01cc5188717b5644ab8384beb8fd8906bdfc8e227

From 6946a7fa508f4be45f2d32b5ebc2a9a31a30a92c Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Fri, 6 Sep 2024 15:01:00 +0000
Subject: [PATCH 50/50] Resolve the "No rule to make target '0'" error when
 building with --disable-tcl.

FossilOrigin-Name: d94541ae76b5d8b69f5524f10dcccc0814283f438a03f553848ed631a1983633
---
 Makefile.in   | 14 ++++++++++++--
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cc75000033..9036babcb2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -661,11 +661,16 @@ SQLITE3_SHELL_TARGET_  = sqlite3$(TEXE)
 SQLITE3_SHELL_TARGET_1 =
 SQLITE3_SHELL_TARGET   = $(SQLITE3_SHELL_TARGET_@HAVE_WASI_SDK@)
 
+# Use $(libtclsqlite3.la_$(HAVE_TCL)) to resolve to either
+# libtclsqlite3.la or an empty value.
+libtclsqlite3.la_0 =
+libtclsqlite3.la_1 = libtclsqlite3.la
+
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
 all:	sqlite3.h libsqlite3.la $(SQLITE3_SHELL_TARGET) \
-  $(HAVE_TCL:1=libtclsqlite3.la)
+  $(libtclsqlite3.la_$(HAVE_TCL))
 
 Makefile: $(TOP)/Makefile.in
 	./config.status
@@ -1566,7 +1571,12 @@ lib_install:	libsqlite3.la
 	$(INSTALL) -d $(DESTDIR)$(libdir)
 	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
 
-install:	sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
+# Use $(tcl_install_$(HAVE_TCL)) to resolve to either tcl_install or
+# an empty value.
+tcl_install_0 =
+tcl_install_1 = tcl_install
+
+install:	sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc $(tcl_install_$(HAVE_TCL))
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(LTINSTALL) sqlite3$(TEXE) $(DESTDIR)$(bindir)
 	$(INSTALL) -d $(DESTDIR)$(includedir)
diff --git a/manifest b/manifest
index b721afee72..9e6ae9fd87 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\sa\sharmless\sstray\scarriage-return\scharacter.
-D 2024-09-06T14:01:48.949
+C Resolve\sthe\s"No\srule\sto\smake\starget\s'0'"\serror\swhen\sbuilding\swith\s--disable-tcl.
+D 2024-09-06T15:01:00.761
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 098d9814c66d81a8bbfb3550876b7d9695a0b050c0d4680afb4931a7aa8fe7f1
+F Makefile.in c41539ec7e8e69091e74c7d9e011115ae5e81d1f53829e640d299f3a754f94a4
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc e72a4653ea8f48efd14c7dac1e7de308a1f3cc91f905f15cbcacc680301c8f03
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ec75cfc5d4b69e4aed64d17748cac15cd62a759a1cbe7feaa4580ad8346b0b95
-R fff388cd7307c5b0da6a2a2532ba0d3f
-U drh
-Z 8d9185ba5e8e9cd8d975e704cf12a0ed
+P 84a6c5f975de36ba93b888e01cc5188717b5644ab8384beb8fd8906bdfc8e227
+R b7c82ea9b1442aabb45d735bf528bcb3
+U stephan
+Z 5b4290c809ba1bac71c5f3f2e0536ccb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 104d10f3e6..e5b5999a3e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-84a6c5f975de36ba93b888e01cc5188717b5644ab8384beb8fd8906bdfc8e227
+d94541ae76b5d8b69f5524f10dcccc0814283f438a03f553848ed631a1983633