From: drh <drh@noemail.net>
Date: Fri, 6 Dec 2019 01:23:38 +0000 (+0000)
Subject: Do not allow UPSERT of a view.
X-Git-Tag: version-3.31.0~257
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6b24ab1b136b151c1d5c0d20cd9ab9991428750;p=thirdparty%2Fsqlite.git

Do not allow UPSERT of a view.

FossilOrigin-Name: ebf897e861c19e214c57f1e73841b505182202cc8d7d39e24d5a1e5625e26b4a
---

diff --git a/manifest b/manifest
index 752c84fb70..6a48eb1aba 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sto\sthe\srowvalue\slogic\sthat\savoids\sdisabling\srowvalue\sinequality\ncontraints\son\sa\svirtual\stable\swhen\sthe\svirtual\stable\ssets\sthe\somit\sflag.\nThe\slogic\shas\sbeen\sincorrect\ssince\srow-values\swere\sadded.\s\sHowever,\sthis\ndoes\snot\scome\sup\soften\sas\svery\sfew\svirtual\stables\simplement\sinequality\nconstraints\susing\sthe\somit\sflag.\s\sTicket\s[f096d191b6641daa]
-D 2019-12-05T21:46:23.038
+C Do\snot\sallow\sUPSERT\sof\sa\sview.
+D 2019-12-06T01:23:38.885
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 1379db6e4330ad1463aa9269d2f23fa25e9f8086f891cb59125080a26fba33d6
+F src/insert.c 730455b1530552212ef67bf51dde86090d3995c432fb5806cd1addc58f2919b7
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c d74f5e7bd51f3c9d283442473eb65aef359664efd6513591c03f01881c4ae2da
 F src/main.c 868ae7db7a54fe859bf2ca8b7a4f24e9fa03a6134abfb7c9801d08411ef5dacb
@@ -1606,7 +1606,7 @@ F test/unixexcl.test d936ba2b06794018e136418addd59a2354eeae97
 F test/unordered.test ffeea7747d5ba962a8009a20b7e53d68cbae05b063604c68702c5998eb50c981
 F test/update.test 1148de8d913e9817717990603aadeca07aab9ddbb10a30f167cbfd8d3a3ccb60
 F test/update2.test 67455bc61fcbcf96923c45b3bc4f87bc72be7d67575ad35f134906148c7b06d3
-F test/upsert1.test 9b115320149e6d72db64511a373c522746c2a2156efdbdb52add33504f66c989
+F test/upsert1.test 0b740c8488fd2f5a06ac317c9913f7ef1eda8282f2db58b544b89480c51efab3
 F test/upsert2.test 9c3cdbb1a890227f6504ce4b0e3de68f4cdfa16bb21d8641208a9239896c5a09
 F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c
 F test/upsert4.test 25d2a1da92f149331ae0c51ca6e3eee78189577585eab92de149900d62994fa5
@@ -1852,7 +1852,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 7d3e3f6e7e55da41bf776fab094df54fb6a33b2967881d3184cf854c8a637518
-R ce499aeb36400479cf5a6c744dc160ea
+P b7810062ec2489e1c5ca6638dbeb0892e4ce376c5c1834a31d1a332ebab8a871
+R ef70deeb84fca6e423b2832b2c399c76
 U drh
-Z 349cfcd46147d1952ab051a45609bfc9
+Z 0beb6993cda04d36d00ba5278cacd512
diff --git a/manifest.uuid b/manifest.uuid
index 6464b8cafa..bc386b7208 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7810062ec2489e1c5ca6638dbeb0892e4ce376c5c1834a31d1a332ebab8a871
\ No newline at end of file
+ebf897e861c19e214c57f1e73841b505182202cc8d7d39e24d5a1e5625e26b4a
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 482a2aff72..4b97112a99 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -949,6 +949,10 @@ void sqlite3Insert(
               pTab->zName);
       goto insert_cleanup;
     }
+    if( pTab->pSelect ){
+      sqlite3ErrorMsg(pParse, "cannot UPSERT a view");
+      goto insert_cleanup;
+    }
     if( sqlite3HasExplicitNulls(pParse, pUpsert->pUpsertTarget) ){
       goto insert_cleanup;
     }
diff --git a/test/upsert1.test b/test/upsert1.test
index 006af438dc..6b5be23b70 100644
--- a/test/upsert1.test
+++ b/test/upsert1.test
@@ -221,4 +221,16 @@ do_execsql_test upsert1-800 {
   REINDEX;
 } {ok}
 
+# 2019-12-06 gramfuzz find
+sqlite3 db :memory:
+do_execsql_test upsert1-900 {
+  CREATE VIEW t1(a) AS SELECT 1;
+  CREATE TRIGGER t1r1 INSTEAD OF INSERT ON t1 BEGIN
+     SELECT 2;
+  END;
+}
+do_catchsql_test upsert1-910 {
+  INSERT INTO t1 VALUES(3) ON CONFLICT(x) DO NOTHING;
+} {1 {cannot UPSERT a view}}
+
 finish_test