Update test file "resetdb.test" so that it works with the "prepare" permutation.

FossilOrigin-Name: 95d338124be2e0e18f17354b28f4320336202f1a4ec1177df753b2800e954bfb

diff --git a/manifest b/manifest
index 5da8389589ec3907d3054c5ddf9fc76c103af43e..e66cfd50d2dc96bd6f9cad49146210a4e5350730 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Early\sdetection\sof\simplausibly\ssized\srecords\sto\savoid\sunnecessary\nlarge\smemory\sallocations.
-D 2019-02-04T21:10:24.890
+C Update\stest\sfile\s"resetdb.test"\sso\sthat\sit\sworks\swith\sthe\s"prepare"\spermutation.
+D 2019-02-05T08:55:43.608
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
@@ -1223,7 +1223,7 @@ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.tcl b290d538ffcb2ff711f09eadc7396c1a42580f3fb078605471dc8875ca0b4d1e x
-F test/resetdb.test 117519739a9570d1152161bd72bb8a40d1a39599b011467a478e2b9fa1eec2a1
+F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
@@ -1804,7 +1804,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 ada91aefe37efe3c009691b5599e4d6acf182e5ec3cf28dda0871d09858498b3
-R bc6315f0c52b3f1996f4a6c2c085613b
-U drh
-Z a2568dbaff1f58a28451297447dddc5f
+P 2c8769c69f301307db6663adb8b7c0b89f5959516bf6110cb8ff4b21bd903f70
+R 36f79ba59bcc36b7ebe2aeab7b080cb9
+U dan
+Z 3069fd78dedb257d8267a4ec925f7be3

diff --git a/manifest.uuid b/manifest.uuid
index 560617347d42ee71ea33f840e6336b0ab9535730..ca25375acc9b621a5e6f9e42d4c075a8d092cff2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2c8769c69f301307db6663adb8b7c0b89f5959516bf6110cb8ff4b21bd903f70
\ No newline at end of file
+95d338124be2e0e18f17354b28f4320336202f1a4ec1177df753b2800e954bfb
\ No newline at end of file

diff --git a/test/resetdb.test b/test/resetdb.test
index 9d249235e84467338905a18c3184806189832a4b..bdb835411017b40fe1c039ca6518ab389ade3855 100644 (file)
--- a/test/resetdb.test
+++ b/test/resetdb.test
@@ -83,6 +83,10 @@ do_test 210 {
   db eval VACUUM
   sqlite3_db_config db RESET_DB 0
 
+  # If using sqlite3_prepare() instead of _v2() or _v3(), the block 
+  # below raises an SQLITE_SCHEMA error. The following fixes this.
+  if {[permutation]=="prepare"} { catchsql "SELECT * FROM sqlite_master" db2 }
+
   # Verify that the reset took, even on the separate database connection
   catchsql {
      PRAGMA page_count;