When disconnecting from the 'swarmvtab' extension, close each database prior to invok...

FossilOrigin-Name: 3e5647cb6c4553683e24b9cb62548f16c79c4e2ac9e39cf135ea52a623f7cc33

diff --git a/ext/misc/unionvtab.c b/ext/misc/unionvtab.c
index 92d0b833c490242132bf9928c31d69d8a1ea7603..94a5c8f013e006c5656c7303b471897a3e913325 100644 (file)
--- a/ext/misc/unionvtab.c
+++ b/ext/misc/unionvtab.c
@@ -484,14 +484,15 @@ static int unionDisconnect(sqlite3_vtab *pVtab){
     int i;
     for(i=0; i<pTab->nSrc; i++){
       UnionSrc *pSrc = &pTab->aSrc[i];
-      if( pSrc->db ){
+      int bHaveSrcDb = (pSrc->db!=0);
+      sqlite3_close(pSrc->db);
+      if( bHaveSrcDb ){
         unionInvokeOpenClose(pTab, pSrc, 1, 0);
       }
       sqlite3_free(pSrc->zDb);
       sqlite3_free(pSrc->zTab);
       sqlite3_free(pSrc->zFile);
       sqlite3_free(pSrc->zContext);
-      sqlite3_close(pSrc->db);
     }
     sqlite3_finalize(pTab->pNotFound);
     sqlite3_finalize(pTab->pOpenClose);

diff --git a/manifest b/manifest
index d00cf8ce0efe909785b4993defa5673c11b52714..6b48ede1ff1b4cfc21383f6561efe686cd616f3b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2018-01-09T20:49:33.189
+C When\sdisconnecting\sfrom\sthe\s'swarmvtab'\sextension,\sclose\seach\sdatabase\sprior\sto\sinvoking\sthe\s'openclose'\sfunction\son\sit.
+D 2018-01-09T22:23:42.971
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 12b6daa4bdb03fa87da27cbc205ff88ace645475b5be79414a3038b68ade14cb
@@ -297,7 +297,7 @@ F ext/misc/spellfix.c 41cf26c6b89fcaa8798ae10ae64d39c1f1d9d6995152e545bd491c1305
 F ext/misc/sqlar.c 57d5bc45cd5492208e451f697404be88f8612527d64c9d42f96b325b64983d74
 F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
-F ext/misc/unionvtab.c 2aa94902ea646e1aaf6c05eac944a14276cddd67735b2ad856030ffffbb6626c
+F ext/misc/unionvtab.c 0b3173f69b8899da640a13a345dc5ef1400199405f738abe6145b2454195b8ff
 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
@@ -1275,7 +1275,7 @@ F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 F test/swarmvtab.test 9a3fd5ab3e9b3c976ad1b3d7646aab725114f2ac26b59395d0778b33bab6cdaf
 F test/swarmvtab2.test c948cb2fdfc5b01d85e8f6d6504854202dc1a0782ab2a0ed61538f27cbd0aa5c
-F test/swarmvtab3.test c4c8d09e56ae99b90187ac225458f13f373873ea296fc442c7ad7511f25e7314
+F test/swarmvtab3.test 6cb664669630fcec4102a09333e52068734858fd2761eee3b0465c14cdbcee29
 F test/swarmvtabfault.test 00aec54665909490f5c383f3cae3b5d18bd97c12490b429ff8752a3027acfa42
 F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
 F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
@@ -1697,7 +1697,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 64c9ccf6c5598a68135e78dad128ec070afa49416e1d1f35745a24276e7aeeea
-R ec154d3d05b58458e2848c5eff3a9b08
+P 0fb42090cb2c785e044abe273a00da134927db191fea7b0c67ba4028944bce3a
+R 6a5a34e76be8657e78b0d58d3645af35
 U mistachkin
-Z cd319f239e5515c89a36567aa5d72543
+Z b0c2e831274b963bd4ec05162b124f71

diff --git a/manifest.uuid b/manifest.uuid
index 2efa25134414717c710819147e0785bb5176b396..c9c91c407daa3928ec2679162181138954ede9f9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0fb42090cb2c785e044abe273a00da134927db191fea7b0c67ba4028944bce3a
\ No newline at end of file
+3e5647cb6c4553683e24b9cb62548f16c79c4e2ac9e39cf135ea52a623f7cc33
\ No newline at end of file

diff --git a/test/swarmvtab3.test b/test/swarmvtab3.test
index 70d6c7dca07e95522382300a501b020bc296b387..6e52355d95383b58ac76ff7ecff51b34d880f8f5 100644 (file)
--- a/test/swarmvtab3.test
+++ b/test/swarmvtab3.test
@@ -74,7 +74,7 @@ proc check_dbcache {} {
   for {set i 0} {$i<100} {incr i} {
     set exists [file exists test.db$i]
     if {$exists!=($::dbcache(test.db$i)!=0)} {
-      error "inconsistent ::dbcache and disk"
+      error "inconsistent ::dbcache and disk ($i) - $exists"
     }
     incr n $exists
   }
@@ -114,7 +114,7 @@ foreach {tn nMaxOpen cvt} {
 
 } {
   execsql { DROP TABLE IF EXISTS s }
-  
+
   do_execsql_test 1.$tn.1 $cvt
 
   do_execsql_test 1.$tn.2 {
@@ -192,7 +192,7 @@ proc check_dbcache {} {
   foreach k [array names ::dbcache] {
     set exists [file exists $k]
     if {$exists!=($::dbcache($k)!=0)} {
-      error "inconsistent ::dbcache and disk ($k)"
+      error "inconsistent ::dbcache and disk ($k) - $exists"
     }
     incr n $exists
   }
@@ -210,23 +210,24 @@ foreach {tn nMaxOpen cvt} {
   }
 } {
   execsql { DROP TABLE IF EXISTS s }
-  
-  do_execsql_test 1.$tn.1 $cvt
 
-  do_execsql_test 1.$tn.2 {
+  do_execsql_test 3.$tn.1 $cvt
+
+  do_execsql_test 3.$tn.2 {
     SELECT b FROM s WHERE a<10;
   } {0 1 2 3 4 5 6 7 8 9}
 
-  do_test 1.$tn.3 { check_dbcache } $nMaxOpen
+  do_test 3.$tn.3 { check_dbcache } $nMaxOpen
 
-  do_execsql_test 1.$tn.4 {
+  do_execsql_test 3.$tn.4 {
     SELECT b FROM s WHERE (b%10)=0;
   } {0 10 20 30 40 50 60 70 80 90}
 
-  do_test 1.$tn.5 { check_dbcache } $nMaxOpen
+  do_test 3.$tn.5 { check_dbcache } $nMaxOpen
 }
 
 db close
+forcedelete {*}[glob test.db*]
 forcedelete {*}[glob test_remote.db*]
 
 finish_test