From 0fc2da3f7982129bc1dbe3b04d8e003c12384221 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Fri, 20 Jul 2018 20:56:22 +0000 Subject: [PATCH 1/2] When dropping a view, skip trying to delete from 'sqlite_stat*'. FossilOrigin-Name: 2f5be3a2ddf469bd1b37b9e357545ce872b90c479a07094de2101d0a43ad70a4 --- manifest | 19 +++++++++++-------- manifest.uuid | 2 +- src/build.c | 6 ++++-- test/view.test | 22 ++++++++++++++++++++++ 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 0d921a529a..1f8cc3f219 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sSQLITE_Stat34\sbit\sof\sthe\soptimization\stest-control\sso\sthat\sit\nprevents\sSTAT4\sdata\sfrom\sbeing\sused\sbut\sallows\sit\sto\sbe\sloaded\sinto\sthe\nIndex\sobjects.\s\sThis\spermits\sSTAT4\sto\sbe\sturned\son\sand\soff\son\sa\sper-statement\nbasis. -D 2018-07-20T19:24:02.431 +C When\sdropping\sa\sview,\sskip\strying\sto\sdelete\sfrom\s'sqlite_stat*'. +D 2018-07-20T20:56:22.700 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6 @@ -441,7 +441,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 F src/btree.c 3f5e1a03db871e627bf5da21092bf7434ecfc5c5980bbd7d45eba13341340173 F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96 -F src/build.c d8f6ac1e9e484eb3f3921a8336d3dc6c87273d9db8729702162ef045997a1463 +F src/build.c 80cd1c21e0c4fc92c6d57bdd4343e81557a0bfde7d883e00937f50e7733d78a6 F src/callback.c 36caff1e7eb7deb58572d59c41cee8f064a11d00297616995c5050ea0cfc1288 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48 @@ -1540,7 +1540,7 @@ F test/vacuum5.test 263b144d537e92ad8e9ca8a73cc6e1583f41cfd0dda9432b87f7806174a2 F test/vacuummem.test 7b42abb3208bd82dd23a7536588396f295a314f2 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661 -F test/view.test 765802c7a66d37fabd5ac8e2f2dbe572b43eb9ab +F test/view.test 42b97dcd3d7c2f5f9439e41b0983e0c6a5718d8b874e9d5e82d3cd25a50ffcf7 F test/vtab1.test 8f91b9538d1404c3932293a588c4344218a0c94792d4289bb55e41020e7b3fff F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e @@ -1750,7 +1750,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a4663f09c91d1381a831f61a2b8e8a113eb6083932c4aea2ad0c011ece1418c5 -R 92bbbb13f79b62d8c050503e495d0c69 -U drh -Z 3d92f0bafb408ca7e67c911625997c83 +P 489f3caf5dcc8cace20a0da58ceb32fdea5770ba570fa3c9f712cd35e726846a +R 3f6b04b00398c1c2ef246fa87ef97b67 +T *branch * dropViewNoStat +T *sym-dropViewNoStat * +T -sym-trunk * +U mistachkin +Z 38c445a25934f5d7f055153013691fd1 diff --git a/manifest.uuid b/manifest.uuid index b1f58c2ec2..70bc9a3656 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -489f3caf5dcc8cace20a0da58ceb32fdea5770ba570fa3c9f712cd35e726846a \ No newline at end of file +2f5be3a2ddf469bd1b37b9e357545ce872b90c479a07094de2101d0a43ad70a4 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 6b761da02a..ba43e76a58 100644 --- a/src/build.c +++ b/src/build.c @@ -2662,8 +2662,10 @@ void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, int noErr){ v = sqlite3GetVdbe(pParse); if( v ){ sqlite3BeginWriteOperation(pParse, 1, iDb); - sqlite3ClearStatTables(pParse, iDb, "tbl", pTab->zName); - sqlite3FkDropTable(pParse, pName, pTab); + if( !isView ){ + sqlite3ClearStatTables(pParse, iDb, "tbl", pTab->zName); + sqlite3FkDropTable(pParse, pName, pTab); + } sqlite3CodeDropTable(pParse, pTab, iDb, isView); } diff --git a/test/view.test b/test/view.test index 694b3c6abd..857d077345 100644 --- a/test/view.test +++ b/test/view.test @@ -674,5 +674,27 @@ do_test view-22.2 { lsort [array names x] } {{} * :1 :2} +do_test view-25.1 { + db eval { + CREATE TABLE t25 (x); + INSERT INTO t25 (x) VALUES (1); + ANALYZE; + } + proc authLogDelete {code arg1 arg2 arg3 arg4 args} { + if {$code=="SQLITE_DELETE" && [string match sqlite_stat* $arg1]} { + lappend ::log [list $code $arg1 $arg2 $arg3 $arg4 $args] + } + return SQLITE_OK + } + set log "" + db authorizer ::authLogDelete + db eval {DROP VIEW x1;} + set log +} {} +do_test view-25.2 { + set log "" + db eval {DROP TABLE t25;} + set log +} {{SQLITE_DELETE sqlite_stat1 {} main {} {}}} finish_test From 9a047bb8818bdb844f81ce3ae56af171f97a0811 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 22 Jul 2018 00:45:11 +0000 Subject: [PATCH 2/2] Remove an unused branch in the FK logic. FossilOrigin-Name: 523ff77925f1da361cf31e3fc82bcb1708ed356a2391430ab14ef620c9bf2327 --- manifest | 17 +++++++---------- manifest.uuid | 2 +- src/fkey.c | 3 ++- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 1f8cc3f219..a41f2dd458 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sdropping\sa\sview,\sskip\strying\sto\sdelete\sfrom\s'sqlite_stat*'. -D 2018-07-20T20:56:22.700 +C Remove\san\sunused\sbranch\sin\sthe\sFK\slogic. +D 2018-07-22T00:45:11.915 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6 @@ -451,7 +451,7 @@ F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91 F src/delete.c 4c8c7604277a2041647f96b78f4b9a47858e9217e4fb333d35e7b5ab32c5b57f F src/expr.c bb148f4c45b6e53b5b58a912974253547e8862685cb001fbdfaef0ab24812e6f F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 -F src/fkey.c b1da9ef8dc834603bb0d28972378a7ce65897847f9a1e89ab800bbdf24c788ee +F src/fkey.c f59253c0be4b1e9dfcb073b6d6d6ab83090ae50c08b5c113b76013c4b157cd6a F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f F src/global.c 9bf034fd560bdd514715170ed8460bb7f823cec113f0569ef3f18a20c7ccd128 F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a @@ -1750,10 +1750,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 489f3caf5dcc8cace20a0da58ceb32fdea5770ba570fa3c9f712cd35e726846a -R 3f6b04b00398c1c2ef246fa87ef97b67 -T *branch * dropViewNoStat -T *sym-dropViewNoStat * -T -sym-trunk * -U mistachkin -Z 38c445a25934f5d7f055153013691fd1 +P 2f5be3a2ddf469bd1b37b9e357545ce872b90c479a07094de2101d0a43ad70a4 +R e0000bc54eae37361f9929961ff6e6b2 +U drh +Z 18bbbe031e5d9c4a1f1bd3bf41814fc9 diff --git a/manifest.uuid b/manifest.uuid index 70bc9a3656..9826c9df40 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2f5be3a2ddf469bd1b37b9e357545ce872b90c479a07094de2101d0a43ad70a4 \ No newline at end of file +523ff77925f1da361cf31e3fc82bcb1708ed356a2391430ab14ef620c9bf2327 \ No newline at end of file diff --git a/src/fkey.c b/src/fkey.c index 256b19db8a..0f5248fea2 100644 --- a/src/fkey.c +++ b/src/fkey.c @@ -710,11 +710,12 @@ static void fkTriggerDelete(sqlite3 *dbMem, Trigger *p){ */ void sqlite3FkDropTable(Parse *pParse, SrcList *pName, Table *pTab){ sqlite3 *db = pParse->db; - if( (db->flags&SQLITE_ForeignKeys) && !IsVirtual(pTab) && !pTab->pSelect ){ + if( (db->flags&SQLITE_ForeignKeys) && !IsVirtual(pTab) ){ int iSkip = 0; Vdbe *v = sqlite3GetVdbe(pParse); assert( v ); /* VDBE has already been allocated */ + assert( pTab->pSelect==0 ); /* Not a view */ if( sqlite3FkReferences(pTab)==0 ){ /* Search for a deferred foreign key constraint for which this table ** is the child table. If one cannot be found, return without