Update an assert statement that could fail when using "PRAGMA writable_schema = 1...

FossilOrigin-Name: 55cad6f628a4313c6652b36474c3397f097ac5c2503ae94605c030a54dc40916

diff --git a/manifest b/manifest
index 987b8c49a6b303ad2cb290db85d93a1703ec3a6e..1c8e6ac65c9049605fb038732853155d56820b12 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sissue\swith\sfailing\s--enable-debug\s--enable-fts5\sbuild.
-D 2021-04-06T17:51:18.096
+C Update\san\sassert\sstatement\sthat\scould\sfail\swhen\susing\s"PRAGMA\swritable_schema\s=\s1"\sto\saccess\sa\sdatabase\swith\sa\scorrupt\sschema.
+D 2021-04-06T18:02:17.700
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 800eb0b92406897130cec04073dfb0089bcda1e77acc0864ee60acb5fec5c5a2
+F src/btree.c 36a162403b7e897668ea3f894e40c647ec8cf7b0e533b8c9e4d0f4450f3b52b0
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c 927ec1d6a02642509c3ff55e74753e396036ef01cab4ef01ea0756349976854b
@@ -800,7 +800,7 @@ F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
 F test/corruptL.test 22589f503602cc5984e80f27f46c4de2134f24f1515ba2440513c377cb692258
 F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
-F test/corruptN.test 0cbe7d96492110e557be65834305f911a1ed64802d01f020a525696e78cd3211
+F test/corruptN.test 352c8f006b46130c27c06d4894c0919123308440473d699ec796b9c04f828ad8
 F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
 F test/count.test 5364003488249957750a5f15ee42ca1cd7b100b1131c2dc71fff266a1250bf55
 F test/countofview.test e17d6e6688cf74f22783c9ec6e788c0790ee4fbbaee713affd00b1ac0bb39b86
@@ -1912,7 +1912,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 039ad662dd899048da04238c05b8cf384323f6e8c1087b96428ea9e20726c8c0
-R fd5cd36547c0a7147f46afa7704df88b
+P e7491acc0c93b7b0b5a27130d956bb23f876b90ced11cdd416a86727af076ee1
+R aad8c23802ec7058efd7b1a15ae0887a
 U dan
-Z c1640ce900c187750f4a20f59117f4c7
+Z 287be7e7ee318d60143976869f040e7c

diff --git a/manifest.uuid b/manifest.uuid
index 3f56ccfcd5c9bb26eacefa401546ffb027a249a2..d13acc259a0b2c4eaf3e98376e0d95e5ea24315f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7491acc0c93b7b0b5a27130d956bb23f876b90ced11cdd416a86727af076ee1
\ No newline at end of file
+55cad6f628a4313c6652b36474c3397f097ac5c2503ae94605c030a54dc40916
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 7d69857aa262dea9004e51e152e8220470f40664..782efe57e659d4b6718f0cb21a4155748fd8ef78 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9110,7 +9110,7 @@ int sqlite3BtreeDelete(BtCursor *pCur, u8 flags){
     rc = btreeRestoreCursorPosition(pCur);
     if( rc ) return rc;
   }
-  assert( pCur->eState==CURSOR_VALID );
+  assert( CORRUPT_DB || pCur->eState==CURSOR_VALID );
 
   iCellDepth = pCur->iPage;
   iCellIdx = pCur->ix;

diff --git a/test/corruptN.test b/test/corruptN.test
index 9f9260d8517e5349ecf15237d9313aaf5f6ad92d..c015537448c26e13036ef7067bd908f65431fe0f 100644 (file)
--- a/test/corruptN.test
+++ b/test/corruptN.test
@@ -163,6 +163,33 @@ do_catchsql_test 3.1 {
   INSERT INTO t1(y) VALUES('abc');
 } {1 {database disk image is malformed}}
 
+reset_db
+do_execsql_test 4.1 {
+  CREATE TABLE x1(a INTEGER PRIMARY KEY, b UNIQUE, c UNIQUE);
+  INSERT INTO x1 VALUES(1, 1, 2);
+  INSERT INTO x1 VALUES(2, 2, 3);
+  INSERT INTO x1 VALUES(3, 3, 4);
+  INSERT INTO x1 VALUES(4, 5, 6);
+  PRAGMA writable_schema = 1;
+
+  UPDATE sqlite_schema SET rootpage = (
+    SELECT rootpage FROM sqlite_schema WHERE name = 'sqlite_autoindex_x1_2'
+  ) WHERE name = 'sqlite_autoindex_x1_1';
+}
+
+db close
+sqlite3 db test.db
+breakpoint
+do_catchsql_test 3.1 {
+  PRAGMA writable_schema = 1;
+  PRAGMA vdbe_trace = 1;
+  REPLACE INTO x1 VALUES(5, 2, 3);
+} {1 {database disk image is malformed}}
+
+explain_i {
+  REPLACE INTO x1 VALUES(5, 2, 3);
+  }
+
 
 
 finish_test