In the CLI, when opening a file that begins with the normal SQLite prefix,

open the file as a normal database even if it has a ZIP for AppendVFS record
at the end.

FossilOrigin-Name: 7989bbda70a24611c3b8af96a53114bb53d87a2e1145ec7ad4f1b4cbf8d6040c

diff --git a/manifest b/manifest
index aaaac750bd910745046cf128ffac603135f76aad..0eca201021901ad3361b223fb7561e3b39f87d79 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\ssqlite3_deserialize()\sin\sthe\sCLI.\s\sThe\s--deserialize\soption\sassociated\nwith\sopening\sa\snew\sdatabase\scause\sthe\sdatabase\sfile\sto\sbe\sread\sinto\smemory\nand\saccessed\susing\sthe\ssqlite3_deserialize()\sAPI.\s\sThis\ssimplifies\srunning\s\ntests\son\sa\sdatabase\swithout\srisk\sof\smodifying\sthe\sfile\son\sdisk.
-D 2018-10-30T13:19:49.896
+C In\sthe\sCLI,\swhen\sopening\sa\sfile\sthat\sbegins\swith\sthe\snormal\sSQLite\sprefix,\nopen\sthe\sfile\sas\sa\snormal\sdatabase\seven\sif\sit\shas\sa\sZIP\sfor\sAppendVFS\srecord\nat\sthe\send.
+D 2018-10-30T14:36:21.740
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 64113b9c489de88bf5ea29d7426fa3f63938ee5f5e4a4fea1f6e62a25efba177
@@ -505,7 +505,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bc8c79e56439b111e7d9415e44940951f7087e9466c3a9d664558ef0faf31073
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f
-F src/shell.c.in ac4a731dac549746242281d0dac44d53b9f2373f4079cb870cb2681f3e719f6b
+F src/shell.c.in a1fa74761b1bdeca5d40dcfdf55fd88f5139155e2bdd2c6b3e9e8e359d062a7d
 F src/sqlite.h.in 4b4c2f2daeeed4412ba9d81bc78092c69831fe6eda4f0ae5bf951da51a8dccec
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63
@@ -1774,7 +1774,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 147a9429a558cf34c316ab8f87832e97caff55d92df696ab6fd045466c8c663d
-R 60676dfd9c16e59bb8febcd06a129176
+P 5e0129ee9afa7c2d707f8ac9e29ef3583c49bb1d0965085c067d58f828ac8cdf
+R 483e69e1ee704e97514f1a28385e28f9
 U drh
-Z 8d1616bb6665374bfbdd3e19d20e8131
+Z a4c51b591abc7bf95f3ada3df5e196d6

diff --git a/manifest.uuid b/manifest.uuid
index 0f7ca93aba5457b397cb50b513f7e8478cbc7896..59244856d34c8d905cf06e7256be57a513f537f3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e0129ee9afa7c2d707f8ac9e29ef3583c49bb1d0965085c067d58f828ac8cdf
\ No newline at end of file
+7989bbda70a24611c3b8af96a53114bb53d87a2e1145ec7ad4f1b4cbf8d6040c
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 73a649410d112cc5e12646947e568aeb2753cd2e..3ec31f83da6fe5a969097230b0223e10c80cd712 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3675,6 +3675,11 @@ int deduceDatabaseType(const char *zName, int dfltZip){
        return SHELL_OPEN_NORMAL;
     }
   }
+  n = fread(zBuf, 16, 1, f);
+  if( n==1 && memcmp(zBuf, "SQLite format 3", 16)==0 ){
+    fclose(f);
+    return SHELL_OPEN_NORMAL;
+  }
   fseek(f, -25, SEEK_END);
   n = fread(zBuf, 25, 1, f);
   if( n==1 && memcmp(zBuf, "Start-Of-SQLite3-", 17)==0 ){