]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Report an error if RETURNING is used for DELETE or UPDATE of a virtual table.
authordrh <>
Tue, 2 Feb 2021 12:01:22 +0000 (12:01 +0000)
committerdrh <>
Tue, 2 Feb 2021 12:01:22 +0000 (12:01 +0000)
FossilOrigin-Name: bd5dee8425327fde0429043ce325b910f1b7951988d9a448a8eeeb713a46bc81

manifest
manifest.uuid
src/trigger.c

index 65556f2f8c8bf85d2132c970e0ba161fad8c18d3..502b6f6d4c2e7d30f4fd9bc0942bd0a50643e9d3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sthe\sRETURNING\strigger\sto\sexist\sfor\svirtual\stables.
-D 2021-02-02T00:16:15.269
+C Report\san\serror\sif\sRETURNING\sis\sused\sfor\sDELETE\sor\sUPDATE\sof\sa\svirtual\stable.
+D 2021-02-02T12:01:22.075
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -607,7 +607,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c c64c49d7c2ec4490c2fef1f24350167ba16b03b0c6cee58ad1a1d70a4325d4e9
 F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
-F src/trigger.c 80c38e0d22bf062b2076a348885f40450dea5a0f5a4335916b71201653962e61
+F src/trigger.c 0e8d33e9ba2c9ce2a3ded92b6d81afd56bac39dc0faf18455b3b49f71a451195
 F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723
 F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@ -1899,7 +1899,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7611c77d6baa84086ff18cbd045127fd682c6d5c434af5404e34fbe631fedfe1
-R 037a63c21faae44932a1c96611422080
+P 2f244ab4a2ba2bdb608cf44ef02e00738ad58c10a76d9e4222dc843a17103d92
+R a875c66b94135d7bf08c2474b75d1d9b
 U drh
-Z 602a59ff4156534125d9199fea478bc0
+Z 7903baa82d2a34245eb14a08b0ad275c
index 5ddb54f697955cc9f7ae1038e66806075531767b..9fd2b15429c404fcb25818c55e8e973c5ea5c506 100644 (file)
@@ -1 +1 @@
-2f244ab4a2ba2bdb608cf44ef02e00738ad58c10a76d9e4222dc843a17103d92
\ No newline at end of file
+bd5dee8425327fde0429043ce325b910f1b7951988d9a448a8eeeb713a46bc81
\ No newline at end of file
index efc10bb837e369e1cbd3bf4c7eb009a7308008e9..dd645324d3cdf6e5bda3a850d5f4b1dccf5d5a2b 100644 (file)
@@ -746,6 +746,11 @@ Trigger *sqlite3TriggersExist(
       assert( sqlite3IsToplevel(pParse) );
       p->op = op;
       mask |= TRIGGER_AFTER;
+      if( IsVirtual(pTab) && op!=TK_INSERT ){
+        sqlite3ErrorMsg(pParse,
+           "%s RETURNING is not available on virtual tables",
+           op==TK_DELETE ? "DELETE" : "UPDATE");
+      }
     }else if( p->bReturning && p->op==TK_INSERT && op==TK_UPDATE
               && sqlite3IsToplevel(pParse) ){
       /* Also fire a RETURNING trigger for INSERT on the UPDATE of an UPSERT */