Merge trunk changes into this branch.

FossilOrigin-Name: 6a8ff9ba5e71d817489093d8dff0a8d77365b4222773b941accbd58558d24379

diff --cc ext/fts5/fts5_expr.c
Simple merge

diff --cc ext/fts5/test/fts5misc.test
index 71ad421c45b9e0d6f6d27caef885ce1da9be4aa8,abd4fdaf8976e1814ef0da80fe15a781d68bc98e..0da071192df24cbb9922b9dbcf74cc129d7d55d3
--- 1/ext/fts5/test/fts5misc.test
--- 2/ext/fts5/test/fts5misc.test
+++ b/ext/fts5/test/fts5misc.test
@@@ -572,67 -569,24 +572,85 @@@ do_execsql_test 20.5 
  } {3 1}
  
  #-------------------------------------------------------------------------
 -}
  reset_db
  do_execsql_test 21.0 {
 -do_execsql_test 21.2 {
 +  CREATE TABLE t1(ii INTEGER, x TEXT, y TEXT);
 +  CREATE VIRTUAL TABLE xyz USING fts5(content_rowid=ii, content=t1, x, y);
 +  INSERT INTO t1 VALUES(1, 'one', 'i');
 +  INSERT INTO t1 VALUES(2, 'two', 'ii');
 +  INSERT INTO t1 VALUES(3, 'tree', 'iii');
 +  INSERT INTO xyz(xyz) VALUES('rebuild');
 +}
 +
 +do_execsql_test 21.1 {
 +  UPDATE xyz SET y='TWO' WHERE rowid=2;
 +  UPDATE t1 SET y='TWO' WHERE ii=2;
 +}
 +
 +do_execsql_test 21.2 {
 +  PRAGMA integrity_check
 +} {ok}
 +
 +breakpoint
 +sqlite3_db_config db DEFENSIVE 1
 +do_execsql_test 21.3 {
 +  CREATE TABLE xyz_notashadow(x, y);
 +  DROP TABLE xyz_notashadow;
 +}
 +sqlite3_db_config db DEFENSIVE 0
 +
 +#-------------------------------------------------------------------------
 +reset_db
 +do_execsql_test 22.0 {
 +  SELECT fts5(NULL);
 +} {{}}
 +do_execsql_test 22.1 {
 +  SELECT count(*) FROM (
 +    SELECT fts5_source_id()
 +  )
 +} {1}
 +execsql_pp {
 +  SELECT fts5_source_id()
 +}
 +
 +#-------------------------------------------------------------------------
 +reset_db
 +do_execsql_test 23.0 {
 +  CREATE VIRTUAL TABLE x1 USING fts5(x);
 +  INSERT INTO x1 VALUES('one + two + three');
 +  INSERT INTO x1 VALUES('one + xyz + three');
 +  INSERT INTO x1 VALUES('xyz + two + xyz');
 +}
 +do_execsql_test 23.1 {
 +  SELECT rowid FROM x1('one + two + three');
 +} {1}
 +
 +do_execsql_test 23.2 {
 +  SELECT rowid FROM x1('^".." AND one');
 +} {}
 +
 +do_execsql_test 23.3 {
 +  SELECT rowid FROM x1('abc NEAR ".." NEAR def');
 +} {}
 +
++#-------------------------------------------------------------------------
++reset_db
++do_execsql_test 24.0 {
+   CREATE VIRTUAL TABLE t1 USING fts5(a, detail='none');
+   INSERT INTO t1(a) VALUES('a');
+ }
+ 
 -do_execsql_test 21.3 {
++do_execsql_test 24.2 {
+   SELECT rank FROM ( SELECT rank FROM t1('a NOT "" NOT def') ) ORDER BY 1;
+ } {-1e-06}
+ 
 -do_execsql_test 21.4 {
++do_execsql_test 24.3 {
+   SELECT rank FROM ( SELECT rank FROM t1('a NOT � NOT def') ) ORDER BY 1;
+ } {-1e-06}
+ 
++do_execsql_test 24.4 {
+   SELECT rank FROM ( SELECT rank FROM t1('a NOT "" NOT def') );
+ } {-1e-06}
  
  finish_test
  

diff --cc manifest
index 46056ef32cca6504f39b013e72bfa55813a5befb,bd4f4cbe1c8243e70a301da27c2311ed0b0fdebc..6ad1c9d6c673566b22af0484028598773a205bf1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Tests\sto\simprove\scoverage\sof\sfts5_expr.c.
- D 2024-08-17T19:07:13.921
 -C Adjust\sMakefile.in\sso\sthat\sit\soutputs\sa\sslightly\sbetter\serror\smessage\son\san\nattempt\sto\sbuild\ssomething\sthat\srequires\sTCL\slibraries\swhen\sHAVE_TCL\sis\sfalse.
 -D 2024-08-17T16:17:16.045
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2024-08-17T19:11:09.556
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -89,24 -89,24 +89,24 @@@ F ext/fts3/tool/fts3cov.sh c331d0063594
  F ext/fts3/tool/fts3view.c 413c346399159df81f86c4928b7c4a455caab73bfbc8cd68f950f632e5751674
  F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
  F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 -F ext/fts3/unicode/mkunicode.tcl d5aebf022fa4577ee8cdf27468f0d847879993959101f6dbd6348ef0cfc324a7
 +F ext/fts3/unicode/mkunicode.tcl 63db9624ccf70d4887836c320eda93ab552f21008f3be7ede551eac3ead62baa
  F ext/fts3/unicode/parseunicode.tcl a981bd6466d12dd17967515801c3ff23f74a281be1a03cf1e6f52a6959fc77eb
  F ext/fts5/extract_api_docs.tcl bc3a0ca78be7d3df08e7602c00ca48021ebae40682d75eb001bfdf6e54ffb44e
 -F ext/fts5/fts5.h 6b49ce6eb2e395e7fd84557b21d32f5de8041f2fada4c617e481e99427e24b6e
 -F ext/fts5/fts5Int.h 41fb3a2dd40e818cc96c6f4176dbdf2aaa8f57043cfc9a8f2676e7e6a72ad764
 -F ext/fts5/fts5_aux.c 4584e88878e54828bf7d4d0d83deedd232ec60628b7731be02bad6adb62304b1
 +F ext/fts5/fts5.h 4c6998c6186268b4dbe9baef2c0d2ab974bd90996d61d4dbe801367249be6de4
 +F ext/fts5/fts5Int.h 26a71a09cefa4ef6b4516b204ed48da3e1380970a19b3482eea7c5d805655360
 +F ext/fts5/fts5_aux.c 12cd2512f869217c38b70c31de5b5f741812734fafa80f55b32ea9bbd96e2152
  F ext/fts5/fts5_buffer.c 0eec58bff585f1a44ea9147eae5da2447292080ea435957f7488c70673cb6f09
 -F ext/fts5/fts5_config.c 68cb87a49215f8e7028000b681df4057c430a4a6afbd676463886da94c9e1c37
 -F ext/fts5/fts5_expr.c 4b7734db98393d6f7fbc5c9c71ebcabe70110f7df08f6b136d096a1eaee0f56a
 +F ext/fts5/fts5_config.c 353d2a0d12678cae6ab5b9ce54aed8dac0825667b69248b5a4ed81cbefc109ea
- F ext/fts5/fts5_expr.c 2667e822e90da6c41485b13ad8aa81e7e8768ff9018743a96fac6ddd76ecd0b9
++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_main.c 6ec7a7d005c632d86e510ddfaca56b197a5b20b61848415764b91bd27d1e4f84
 -F ext/fts5/fts5_storage.c 1d7e08d4331da2f3f7e78e70eef2ed6a013d91ba16175c651adbc5ad672235aa
 -F ext/fts5/fts5_tcl.c 5ca3e3e35010d326f5b821a563e4fcde3913e052935f5c2c72c264122a26b48f
 +F ext/fts5/fts5_main.c 23029229021240dc21a69eb749305316103d183375413e2090c064b74b03b7f8
 +F ext/fts5/fts5_storage.c acece8abf1b4b2012bdad93aa2d2cf6fc0d1da919763479c7055f699c2cde96c
 +F ext/fts5/fts5_tcl.c 1dcf08028141c40a32634bdcf2d5601622ce4edc48f82ac4ce0cbe0a92a6961d
  F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
  F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a9aa85d36f3b
 -F ext/fts5/fts5_tokenize.c 63ebe9057ed3f4dfc49944bc4aee3d3b745cc2faff73bc152ed3554ed3bf9cf4
 -F ext/fts5/fts5_unicode2.c eca63dbc797f8ff0572e97caf4631389c0ab900d6364861b915bdd4735973f00
 +F ext/fts5/fts5_tokenize.c ae9c4fa93174ef06ffc138bd4280a1c37f7e13624d3d2706aad4b80573f23c41
 +F ext/fts5/fts5_unicode2.c 6f9b0fb79a8facaed76628ffd4eb9c16d7f2b84b52872784f617cf3422a9b043
  F ext/fts5/fts5_varint.c e64d2113f6e1bfee0032972cffc1207b77af63319746951bf1d09885d1dadf80
  F ext/fts5/fts5_vocab.c e4830b00809e5da53bc10f93adc59e321407b0f801c7f4167c0e47f5552267e0
  F ext/fts5/fts5parse.y eb526940f892ade5693f22ffd6c4f2702543a9059942772526eac1fde256bb05
@@@ -191,7 -188,7 +191,7 @@@ F ext/fts5/test/fts5locale.test 79cbd30
  F ext/fts5/test/fts5matchinfo.test 877520582feb86bbfd95ab780099bcba4526f18ac75ee34979144cf86ba3a5a3
  F ext/fts5/test/fts5merge.test 2654df0bcdb2d117c2d38b6aeb0168061be01c643f9e9194b36c43a2970e8082
  F ext/fts5/test/fts5merge2.test 3ebad1a59d6ad3fb66eff6523a09e95dc6367cbefb3cd73196801dea0425c8e2
- F ext/fts5/test/fts5misc.test 558bc33c7b0b987b95e16c927f8a21e42f9a625eafad806b37f44008f5bf6314
 -F ext/fts5/test/fts5misc.test b1682a40061bc58dcc62bbad48938fc5214d2ac6a868a8899c0c3d1930f1115d
++F ext/fts5/test/fts5misc.test c0521e173b16d40b5a37e7e436459028403be1e6d3a5f4dfb2ef515d4486124b
  F ext/fts5/test/fts5multi.test a15bc91cdb717492e6e1b66fec1c356cb57386b980c7ba5af1915f97fe878581
  F ext/fts5/test/fts5multiclient.test 5ff811c028d6108045ffef737f1e9f05028af2458e456c0937c1d1b8dea56d45
  F ext/fts5/test/fts5near.test 33d60867581066e5db7016deb5d651628125d7ff4e0233a88175aa5b65874c74
@@@ -2208,8 -2205,8 +2209,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 8f9257361b05e368bf433e56d0698923b0f97d12e7c0ad7760aaab6746c0e467
- R f8d6b944dbf347c8074787f443d7147c
 -P 793ff83d09bea165c8cedc978afd3fcfb1a4cee894c5914aa1d92416afce963d
 -R be5ece8b231f01bec02cbe9ef4eda884
 -U drh
 -Z 6d429e685f531219ca0d0afba9760eb7
++P f4b839e5265700b1a89066d1b6e0d0d010852a69c5da3d75d2c41624dbf3c0af a4043cbeb8a08fca2fdd2ea703e030d3a5574cc6002292ecc6f0e88c116472a3
++R 49e782c5b107501b250d5b7832f0211a
 +U dan
- Z d2bdd09fc432aeea5dfb2a1dda9df33e
++Z 89224bb8e19ae56a7b37235b096e6728
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 50b3e4e2a46943a3d47b54b8606cb71a1275aba2,a5034c9d32f62b33da47b3afde724178e9d39b72..b7bf2f3e64db0bcd9faf74e6fc906d5ff31cf7fa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f4b839e5265700b1a89066d1b6e0d0d010852a69c5da3d75d2c41624dbf3c0af
 -a4043cbeb8a08fca2fdd2ea703e030d3a5574cc6002292ecc6f0e88c116472a3
++6a8ff9ba5e71d817489093d8dff0a8d77365b4222773b941accbd58558d24379