Fix a problem with DROP TABLE statements on zonefile virtual tables.

FossilOrigin-Name: d2ed6910b86a086911d3c0670c9778e222186d8733fc81bcc081932d70e0452a

diff --git a/ext/zonefile/zonefile.c b/ext/zonefile/zonefile.c
index e31fe5bd00c7a0c1582ae39312e8f3a41e5016c1..3d97143226cd1d6ad6fafebdc9e7dec9601c8563 100644 (file)
--- a/ext/zonefile/zonefile.c
+++ b/ext/zonefile/zonefile.c
@@ -2730,7 +2730,8 @@ static int zonefileDestroy(sqlite3_vtab *pVtab){
       "DROP TABLE IF EXISTS %Q.'%q_shadow_file';"
       "DROP TABLE IF EXISTS %Q.'%q_shadow_frame';"
       "DROP TABLE IF EXISTS %Q.'%q_files';",
-      pTab->zDb, pTab->zName, pTab->zDb, pTab->zName, pTab->zDb, pTab->zName
+      pTab->zDb, pTab->zName, pTab->zDb, pTab->zName, 
+      pTab->zDb, pTab->zName, pTab->zDb, pTab->zName
   );
   if( zSql==0 ){
     rc = SQLITE_NOMEM;

diff --git a/ext/zonefile/zonefile1.test b/ext/zonefile/zonefile1.test
index 8a3a5e04c91efb21bae4d6d6d515f85e13185c7a..9c5a5db20064b1c0dd8531537f63b7afe3acd0d8 100644 (file)
--- a/ext/zonefile/zonefile1.test
+++ b/ext/zonefile/zonefile1.test
@@ -63,6 +63,10 @@ do_execsql_test 1.6 { SELECT count(*) FROM z1_shadow_idx } 0
 
 do_execsql_test 1.7 { DROP TABLE z1 }
 
+do_execsql_test 1.8 {
+  SELECT * FROM sqlite_master WHERE name LIKE 'z1%';
+}
+
 #-------------------------------------------------------------------------
 # Figure out which compression algorithms, if any, are supported by
 # this build. Populate the global list $COMPRESSION_METHODS with the

diff --git a/manifest b/manifest
index 8e1d1b50b6f79f83956a7b03ccdbd5d68fdcdbda..0801755c62333da01591cda7dc2ded0836e9b665 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\szonefile\sextension\sseen\swith\sMSVC.
-D 2018-02-23T14:00:38.536
+C Fix\sa\sproblem\swith\sDROP\sTABLE\sstatements\son\szonefile\svirtual\stables.
+D 2018-02-23T14:02:37.758
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
@@ -409,8 +409,8 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
 F ext/zonefile/README.md df86ef5b4f9aa8b07e1c8124b3f2dcea616927385aad59d525b784f0a06d446c
-F ext/zonefile/zonefile.c 4cab22c4b43499099f2ff3bdb0292f9bdf0dfd077948c4ed9a6479532011d2ae
-F ext/zonefile/zonefile1.test d80e8fd9db0b4b942628d00136ee448ce5b1b5e09f4b85a25aef500b888d62e9
+F ext/zonefile/zonefile.c 7c04566deab0f0f73ca51a362a5956ff2deedf13e7d075a3a1a8c2ce0616a06d
+F ext/zonefile/zonefile1.test c73fb68d6b91e4047ee96915b91fa21c9df4afa23a4d4a259bce154857a35610
 F ext/zonefile/zonefileenc.test f23e16fc8810c95588dfd528af8e4332f0d1d13370fdd7163226ec886715058e
 F ext/zonefile/zonefilefault.test 7f93ba8420d6f6a461d2fbbce30a04f744764f584c0c17361a867db8088f5595
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -1712,7 +1712,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 d716dff4441b4d28e0184ce06508bc9122451103ead8edbfbf3c87b666445ee6
-R 712509a970c46f53beac46f7a0038889
-U mistachkin
-Z 2cb656811a0799bf4622d31d9206483b
+P d28003941ceca7fb707fcdb09bf8b00a6c1b728956e018d7ecfb6852d7dd469b
+R 849892d2fa074127eff1001fda11445f
+U dan
+Z 7bc772e52758d21df20545fe5c18ee0c

diff --git a/manifest.uuid b/manifest.uuid
index 63b1c734efcbf7b37b06c0407c36e768860cb25d..a3a83269c89e3afe2a6a69b851aae6136e8798c3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d28003941ceca7fb707fcdb09bf8b00a6c1b728956e018d7ecfb6852d7dd469b
\ No newline at end of file
+d2ed6910b86a086911d3c0670c9778e222186d8733fc81bcc081932d70e0452a
\ No newline at end of file