From: drh <drh@noemail.net>
Date: Wed, 21 May 2014 08:21:07 +0000 (+0000)
Subject: Fix the sqlite3_db_readonly() API so that it reports true if the database
X-Git-Tag: version-3.8.5~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=781597fecacbf3b6808eec363d9f2a249f709fa6;p=thirdparty%2Fsqlite.git

Fix the sqlite3_db_readonly() API so that it reports true if the database
is readonly because the file format write version (byte 18 of the header)
is too large.

FossilOrigin-Name: 8d8af114dac301335ec10671c1e9a5a6d8266a60
---

diff --git a/manifest b/manifest
index 6c0b7335d0..3b9077a23e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Internally,\suse\sa\s64-bit\sintegers\sfor\ssegment\slevel\snumbers.
-D 2014-05-17T16:56:52.166
+C Fix\sthe\ssqlite3_db_readonly()\sAPI\sso\sthat\sit\sreports\strue\sif\sthe\sdatabase\nis\sreadonly\sbecause\sthe\sfile\sformat\swrite\sversion\s(byte\s18\sof\sthe\sheader)\nis\stoo\slarge.
+D 2014-05-21T08:21:07.032
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,8 +165,8 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 6c9b51abd404ce5b78b173b6f2248e8cb824758c
-F src/btree.h d79306df4ed9181b48916737fe8871a4392c4594
+F src/btree.c e29fc07a968f8d1bbe38b5736d71db59959f545c
+F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
 F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 F src/build.c 02665ca158431a0926b10cbd7d8178a4c9fc4a22
 F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
@@ -187,7 +187,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
 F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
-F src/main.c 1c164c7b742f0cd60290b34dc9086df9f939f490
+F src/main.c 40d0837e5d0597eadc47c3acc2fc95bdbd9250b8
 F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@ -761,7 +761,7 @@ F test/quota2.test 7dc12e08b11cbc4c16c9ba2aa2e040ea8d8ab4b8
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
-F test/rdonly.test c267d050a1d9a6a321de502b737daf28821a518d
+F test/rdonly.test dd30a4858d8e0fbad2304c2bd74a33d4df36412a
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.mk 2eced2f9ae701fd0a29e714a241760503ccba25a
@@ -1172,7 +1172,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9fde5b960af39b187474e5b2909ff0e56d5e0bf9 7e60347e21a7473974061965a8d1f2eadde987e2
-R 760c47be4e4c59e75f81e88f9a3c89bc
-U dan
-Z a762a27782746cb8cee894bb7c1f28d3
+P 8180e320ee4090e41511836678e49a98c0b228e8
+R b879444f11b669403e97810357ceb345
+U drh
+Z b05cb2782a9599f9d7e92cfd6f56d7de
diff --git a/manifest.uuid b/manifest.uuid
index 6307ea55eb..4fef6aca7f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8180e320ee4090e41511836678e49a98c0b228e8
\ No newline at end of file
+8d8af114dac301335ec10671c1e9a5a6d8266a60
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 2bf026b840..e843a946b0 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8526,3 +8526,10 @@ void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
   assert( mask==BTREE_BULKLOAD || mask==0 );
   pCsr->hints = mask;
 }
+
+/*
+** Return true if the given Btree is read-only.
+*/
+int sqlite3BtreeIsReadonly(Btree *p){
+  return (p->pBt->btsFlags & BTS_READ_ONLY)!=0;
+}
diff --git a/src/btree.h b/src/btree.h
index e452a23f7a..7118534f93 100644
--- a/src/btree.h
+++ b/src/btree.h
@@ -194,6 +194,7 @@ void sqlite3BtreeIncrblobCursor(BtCursor *);
 void sqlite3BtreeClearCursor(BtCursor *);
 int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
 void sqlite3BtreeCursorHints(BtCursor *, unsigned int mask);
+int sqlite3BtreeIsReadonly(Btree *pBt);
 
 #ifndef NDEBUG
 int sqlite3BtreeCursorIsValid(BtCursor*);
diff --git a/src/main.c b/src/main.c
index d150d19d3c..6b54ca6da5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3445,5 +3445,5 @@ const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName){
 */
 int sqlite3_db_readonly(sqlite3 *db, const char *zDbName){
   Btree *pBt = sqlite3DbNameToBtree(db, zDbName);
-  return pBt ? sqlite3PagerIsreadonly(sqlite3BtreePager(pBt)) : -1;
+  return pBt ? sqlite3BtreeIsReadonly(pBt) : -1;
 }
diff --git a/test/rdonly.test b/test/rdonly.test
index bf19597871..938cc7884c 100644
--- a/test/rdonly.test
+++ b/test/rdonly.test
@@ -32,6 +32,9 @@ do_test rdonly-1.1 {
     SELECT * FROM t1;
   }
 } {1}
+do_test rdonly-1.1.1 {
+  sqlite3_db_readonly db main
+} {0}
 
 # Changes the write version from 1 to 3.  Verify that the database
 # can be read but not written.
@@ -47,6 +50,9 @@ do_test rdonly-1.3 {
     SELECT * FROM t1;
   }
 } {1}
+do_test rdonly-1.3.1 {
+  sqlite3_db_readonly db main
+} {1}
 do_test rdonly-1.4 {
   catchsql {
     INSERT INTO t1 VALUES(2)