Change SQLITE_FCNTL_ZIPVFS_PAGER to SQLITE_FCNTL_ZIPVFS.

FossilOrigin-Name: f7865b942834dd2f6b865336e08ba1adbf20612a

diff --git a/ext/ota/sqlite3ota.c b/ext/ota/sqlite3ota.c
index 369f035e418af0a9a2d417bf5bf93df750a425aa..92d8ecb9921ab8b1acb5b6baaa16e5ade5a47e43 100644 (file)
--- a/ext/ota/sqlite3ota.c
+++ b/ext/ota/sqlite3ota.c
@@ -2985,7 +2985,7 @@ static int otaVfsFileControl(sqlite3_file *pFile, int op, void *pArg){
       /* Now search for a zipvfs instance lower down in the VFS stack. If
       ** one is found, this is an error.  */
       void *dummy = 0;
-      rc = xControl(p->pReal, SQLITE_FCNTL_ZIPVFS_PAGER, &dummy);
+      rc = xControl(p->pReal, SQLITE_FCNTL_ZIPVFS, &dummy);
       if( rc==SQLITE_OK ){
         rc = SQLITE_ERROR;
         pOta->zErrmsg = sqlite3_mprintf("ota/zipvfs setup error");

diff --git a/main.mk b/main.mk
index 510c890c3c5a3907197693d6f2e6e4a63f853d89..40e5e1a8734325a98f3c9cc61b5de998bb8e5df6 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -239,6 +239,7 @@ SRC += \
 TESTSRC = \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_test.c \
+  $(TOP)/ext/ota/test_ota.c \
   $(TOP)/src/test1.c \
   $(TOP)/src/test2.c \
   $(TOP)/src/test3.c \
@@ -340,8 +341,7 @@ TESTSRC2 = \
   $(TOP)/ext/fts3/fts3_expr.c \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_write.c \
-  $(TOP)/ext/async/sqlite3async.c \
-  $(TOP)/ext/ota/test_ota.c
+  $(TOP)/ext/async/sqlite3async.c 
 
 # Header files used by all library source files.
 #

diff --git a/manifest b/manifest
index da076decb22d330573ac8eb3a43010c18375e327..5dcc60482af20a0a66fb372ceda8f059f862d0af 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\ssqlite3ota_db()\sAPI\sto\saccount\sfor\sthe\sfact\sthat\seach\sOTA\shandle\snow\suses\stwo\sSQLite\sdatabase\shandles.
-D 2015-02-23T15:02:13.758
+C Change\sSQLITE_FCNTL_ZIPVFS_PAGER\sto\sSQLITE_FCNTL_ZIPVFS.
+D 2015-02-23T15:41:48.246
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -138,7 +138,7 @@ F ext/ota/otaA.test ef4bfa8cfd4ed814ae86f7457b64aa2f18c90171
 F ext/ota/otacrash.test a078d34e2edbcedac5f894e3e7d08d452a327007
 F ext/ota/otafault.test 8c43586c2b96ca16bbce00b5d7e7d67316126db8
 F ext/ota/otafault2.test fa202a98ca221faec318f3e5c5f39485b1256561
-F ext/ota/sqlite3ota.c fa63725a85c1208c9e469efc3df18798a12c1cd5
+F ext/ota/sqlite3ota.c e060a4cb49280ee86fc60055ed5de4b3bf56c892
 F ext/ota/sqlite3ota.h 4cd82fbac9cbea89bd51edace3ec5c57866c02e3
 F ext/ota/test_ota.c e34c801c665d64b4b9e00b71f1acf8c652404b2b
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
@@ -170,7 +170,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 00070461df537e8e0ece33cf05caf3d536c28802
+F main.mk aac7f4bf0da24bd23faf1847d83f6b959e5a1635
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -250,7 +250,7 @@ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
 F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
-F src/sqlite.h.in ffa60a89ebc7d2ac7140680a6a189dbced6b72c3
+F src/sqlite.h.in af7fb18afaacfde7db4ab70903785dbd7a91e851
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
@@ -1258,7 +1258,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1cb675e5392f179516d8e7a52760922a6c7df4d0
-R a9177f7d92fc75d9eccc7912836972e5
+P ef08ecceb7e237a01af6cc3141dccee09ffe9ae3
+R 5ab6f54d5b1118872361d398d8a0c483
 U dan
-Z 89f5d620618d356804404be134f86324
+Z e07f1c54564686b132e0168d58a2ecf5

diff --git a/manifest.uuid b/manifest.uuid
index e2e7546f5756a871d628cebf6d60132e44239db7..a61b88572b6502136d9802b6c9a24bd1cf053aa5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef08ecceb7e237a01af6cc3141dccee09ffe9ae3
\ No newline at end of file
+f7865b942834dd2f6b865336e08ba1adbf20612a
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 9499595acc6ca50d805c9243abea420da430b1bb..b2e9a1d7859378bc36e1eea09509cae3bc502462 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -941,9 +941,9 @@ struct sqlite3_io_methods {
 ** pointed to by the pArg argument.  This capability is used during testing
 ** and only needs to be supported when SQLITE_TEST is defined.
 **
-** <li>[[SQLITE_FCNTL_ZIPVFS_PAGER]]
-** The [SQLITE_FCNTL_ZIPVFS_PAGER] opcode is used by the OTA extension when
-** updating a zipvfs database.
+** <li>[[SQLITE_FCNTL_ZIPVFS]]
+** The [SQLITE_FCNTL_ZIPVFS] opcode is implemented by zipvfs only. All other
+** VFS should return SQLITE_NOTFOUND for this opcode.
 **
 ** </ul>
 */
@@ -969,7 +969,7 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_SYNC                   21
 #define SQLITE_FCNTL_COMMIT_PHASETWO        22
 #define SQLITE_FCNTL_WIN32_SET_HANDLE       23
-#define SQLITE_FCNTL_ZIPVFS_PAGER           24
+#define SQLITE_FCNTL_ZIPVFS                 24
 #define SQLITE_FCNTL_OTA                    25
 
 /* deprecated names */