Have contentless_delete=1 tables support regular DELETE statements, instead of just...

FossilOrigin-Name: fffb8616905501669a94231d5d9f53446bf09553353f2cdab7c43ca54bbb7fa6

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index 180aba39739e7f2166a9d52fc38b60ddd82f46a8..7b1f4a6d0824d854b1f409df297104175415df06 100644 (file)
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -1678,8 +1678,12 @@ static int fts5UpdateMethod(
     assert( nArg!=1 || eType0==SQLITE_INTEGER );
 
     /* Filter out attempts to run UPDATE or DELETE on contentless tables.
-    ** This is not suported.  */
-    if( eType0==SQLITE_INTEGER && fts5IsContentless(pTab) ){
+    ** This is not suported. Except - DELETE is supported if the CREATE
+    ** VIRTUAL TABLE statement contained "contentless_delete=1". */
+    if( eType0==SQLITE_INTEGER 
+     && pConfig->eContent==FTS5_CONTENT_NONE 
+     && (nArg>1 || pConfig->bContentlessDelete==0)
+    ){
       pTab->p.base.zErrMsg = sqlite3_mprintf(
           "cannot %s contentless fts5 table: %s", 
           (nArg>1 ? "UPDATE" : "DELETE from"), pConfig->zName

diff --git a/ext/fts5/test/fts5contentless.test b/ext/fts5/test/fts5contentless.test
index b9b7a2a4a1a5ab8c0882347997ce9f1971ed5181..a55aa84021278e51ebbcfa80ee1018808bd68196 100644 (file)
--- a/ext/fts5/test/fts5contentless.test
+++ b/ext/fts5/test/fts5contentless.test
@@ -99,7 +99,7 @@ do_execsql_test 3.7 {
 }
 
 do_execsql_test 3.8 {
-  INSERT INTO x2(x2, rowid) VALUES('delete', 2);
+  DELETE FROM x2 WHERE rowid=2;
 }
 
 do_execsql_test 3.9 {
@@ -142,7 +142,7 @@ foreach v {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} {
 do_test 4.3 {
   for {set ii 1} {$ii < $nRow} {incr ii 2} { 
     execsql {
-       INSERT INTO ft(ft, rowid) VALUES('delete', $ii);
+       DELETE FROM ft WHERE rowid=$ii;
        DELETE FROM t1 WHERE rowid=$ii;
     }
   }
@@ -175,11 +175,18 @@ do_execsql_test 5.0 {
   INSERT INTO ft(rowid, x) VALUES(3, 'one two five');
 }
 
-breakpoint
 do_execsql_test 5.1 {
-  INSERT INTO ft(ft, rowid) VALUES('delete', 2);
+  DELETE FROM ft WHERE rowid=2
 }
 
+do_execsql_test 5.2 {
+  SELECT rowid FROM ft
+} {1 3}
+
+do_catchsql_test 5.3 {
+  UPDATE ft SET x='four six' WHERE rowid=3
+} {1 {cannot UPDATE contentless fts5 table: ft}}
+
 
 finish_test
 

diff --git a/manifest b/manifest
index 8f2c159d4eb994b0d92dce95e3edaca384161ed2..963270545adbd29d51e5b54c43b2b25fb7d89345 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sa\shash-table\sinstead\sof\sa\sflat\slist\sto\sstore\stombstone\srowids.
-D 2023-07-11T18:55:19.003
+C Have\scontentless_delete=1\stables\ssupport\sregular\sDELETE\sstatements,\sinstead\sof\sjust\sthe\sspecial\sINSERT\ssyntax.
+D 2023-07-11T20:19:46.857
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -93,7 +93,7 @@ F ext/fts5/fts5_config.c 010fabcc0aaa0dfa76b19146e8bddf7de368933eeac01e294af6607
 F ext/fts5/fts5_expr.c 58fb8ceddfb1cefcd54510f9f2f33c220ef9d1b3fa77462111f5ae2a825ab7b1
 F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
 F ext/fts5/fts5_index.c 60c815859589d279ea237a4fdb88386cd5e154288c1c7963e2834ff1edf24915
-F ext/fts5/fts5_main.c 0f4d21152f23fb5182310d1cb2565bbdf2a8085888185a0f1f9117d2c265cc10
+F ext/fts5/fts5_main.c 843a6223397afb07c515aaf074c4bd9079cd7390b3b6d3de585f600afe294d5c
 F ext/fts5/fts5_storage.c beff4be2a53c530676d59355b408733ab28202ae351a0840fa211df17b103c4a
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
@@ -132,7 +132,7 @@ F ext/fts5/test/fts5config.test 60094712debc59286c59aef0e6cf511c37d866802776a825
 F ext/fts5/test/fts5conflict.test 655925678e630d3cdf145d18725a558971806416f453ac8410ca8c04d934238d
 F ext/fts5/test/fts5connect.test 08030168fc96fc278fa81f28654fb7e90566f33aff269c073e19b3ae9126b2f4
 F ext/fts5/test/fts5content.test 213506436fb2c87567b8e31f6d43ab30aab99354cec74ed679f22aad0cdbf283
-F ext/fts5/test/fts5contentless.test b807a15020dfae84f215370f08d7270aa01bbcc5abdb54a42ec2dee8998e4842
+F ext/fts5/test/fts5contentless.test 5ffce3185e40c8025e1fc0a2a484f331f76f9a8e8b8441d169bbe1276b76ae2c
 F ext/fts5/test/fts5corrupt.test 77ae6f41a7eba10620efb921cf7dbe218b0ef232b04519deb43581cb17a57ebe
 F ext/fts5/test/fts5corrupt2.test 7453752ba12ce91690c469a6449d412561cc604b1dec994e16ab132952e7805f
 F ext/fts5/test/fts5corrupt3.test 7da9895dafa404efd20728f66ff4b94399788bdc042c36fe2689801bba2ccd78
@@ -2044,8 +2044,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e513bea84dfaf2280f7429c9a528b3a1354a46c36e58ab178ca45478975634e0
-R e240ab2da08f49c28fa1cdca40ac2a12
+P 948267b066d0dbe667881b3d26a007fa24576da6e57c112676fadeb846c13f0b
+R 3eb31b5966f6d22024a48d705ddecf8e
 U dan
-Z d2566e3569908687c69b9bc52ae7c980
+Z ecb4a545638f553899d716cc379fd8e4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1aeb8a479d17cd612ce5e14cb9ca2e75f0e2e671..06acf1e66a5191f38b68bc72fb7d2a63f961b0e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-948267b066d0dbe667881b3d26a007fa24576da6e57c112676fadeb846c13f0b
\ No newline at end of file
+fffb8616905501669a94231d5d9f53446bf09553353f2cdab7c43ca54bbb7fa6
\ No newline at end of file