From: drh <drh@noemail.net>
Date: Wed, 19 Mar 2008 00:21:30 +0000 (+0000)
Subject: Remove the dependency on the direct btree interface from as many test
X-Git-Tag: version-3.6.10~1297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb8a279e11c2df4b9bc67bb863659b18b1cb6423;p=thirdparty%2Fsqlite.git

Remove the dependency on the direct btree interface from as many test
scripts as is practical.  Fix a bug in the output limiter of the
integrity_check pragma that came up while making this change. (CVS 4880)

FossilOrigin-Name: 24e769972eb6052b82dc94d20444c186a213e104
---

diff --git a/manifest b/manifest
index d286b8594c..983e3d7866 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sdocumentation\sto\sdistinguish\sbetween\sprotected\sand\sunprotected\nsqlite3_value\sobjects.\s(CVS\s4879)
-D 2008-03-18T13:47:21
+C Remove\sthe\sdependency\son\sthe\sdirect\sbtree\sinterface\sfrom\sas\smany\stest\nscripts\sas\sis\spractical.\s\sFix\sa\sbug\sin\sthe\soutput\slimiter\sof\sthe\nintegrity_check\spragma\sthat\scame\sup\swhile\smaking\sthis\schange.\s(CVS\s4880)
+D 2008-03-19T00:21:31
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 5be94fea84f1599672e5041de03b97990baca593
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -132,7 +132,7 @@ F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c 2ebd895730163721d0b470aca47afbe28039c5e7
 F src/pager.h 8174615ffd14ccc2cad2b081b919a398fa95e3f9
 F src/parse.y 00f2698c8ae84f315be5e3f10b63c94f531fdd6d
-F src/pragma.c e3f39f8576234887ecd0c1de43dc51af5855930c
+F src/pragma.c 09128fe3e2b5108d322a66b19a6f2974dac64479
 F src/prepare.c 62e46b1951ff80efca0c35ae1c4bb58a9d24df7f
 F src/printf.c eb27822ba2eec669161409ca31279a24c26ac910
 F src/random.c 02ef38b469237482f1ea14a78b2087cfbaec48bd
@@ -146,7 +146,7 @@ F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e
 F src/table.c 2c48c575dd59b3a6c5c306bc55f51a9402cf429a
 F src/tclsqlite.c d95e0e74c7167b2807f9f4f73bf45f7c58096297
 F src/test1.c c3d43a6bd299f3c115f6617af6715004819ca5cb
-F src/test2.c 89793e863188028b49bd259026a73820426539b3
+F src/test2.c 443ccc1bd5717b1001e5558b6f6b33bd34f8b81b
 F src/test3.c 5c7452038ab27aa698070799b10132f26cdd2a80
 F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071
 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
@@ -188,8 +188,8 @@ F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test d12210212bada2bde6d5aeb90969b86c1aa977d2
 F test/alter.test 1426bb4c8609731622a9bf9dd48c39f5931c4d7d
-F test/alter2.test 9d9850064b5c572991ea744a88ea650045f4ac6a
-F test/alter3.test 8ce6b9c5605b3cfe7b901f454ecaf174c4f93e31
+F test/alter2.test dd55146e812622c8fc51fd2216bcd8dca8880752
+F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
 F test/altermalloc.test 29d4a8400277efb4ba8ffe90804c6dc2fdfbf063
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
 F test/async.test aecaa46ed0618a3c338f3651ca4f10fbb4021044
@@ -226,9 +226,9 @@ F test/btree9.test 5d8711b241145b90f65dd1795d5dd8290846fa5e
 F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 F test/cache.test 3ff445c445742a7b6b9ba6e1d62a25263f9424b9
 F test/capi2.test cc64df7560a96f848f919ea2926c60acf639684b
-F test/capi3.test 590134ad001c831698f5b5b4b3911a45fbadba12
+F test/capi3.test 8abe9bc7b21c6d402628e66fee1b77a47f3800b7
 F test/capi3b.test 664eb55318132f292f2c436f90906f578cad6b97
-F test/capi3c.test 7bcff27698351b6fbe45be5ebae95c1d2a1f4b1a
+F test/capi3c.test f17c6936835213fae25a6686f7fbbbf024c94b5e
 F test/cast.test ce8f14fc80f70b30ed984480cc0d8914a459e8f9
 F test/check.test 024ed399600b799160378cf9d9f436bdf5dfd184
 F test/collate1.test e3eaa48c21e150814be1a7b852d2a8af24458d04
@@ -260,9 +260,9 @@ F test/default.test 252298e42a680146b1dd64f563b95bdf088d94fb
 F test/delete.test 57533e88e886608bf5ae0f394e14c2eb1b1f7754
 F test/delete2.test c06be3806ba804bc8c6f134476816080280b40e3
 F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
-F test/descidx1.test 6c9d528b60d883a8cf8f539c722df6b763c774c0
-F test/descidx2.test eb3a2882ec58aa6e1e8131d9bb54436e5b4a3ce2
-F test/descidx3.test 3a55b8d73bc3e9ad084e0da7fec781cf0d2a0356
+F test/descidx1.test a13d443571e045b61b1b2b759df8dcffa092c968
+F test/descidx2.test 1310ed1326cdfed4ea2c55169631579f082d174f
+F test/descidx3.test 3394ad4d089335cac743c36a14129d6d931c316f
 F test/diskfull.test 34ef53e88372c5b5e488ad1581514559a224c2b1
 F test/distinctagg.test 2b89d1c5220d966a30ba4b40430338669301188b
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
@@ -395,7 +395,7 @@ F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
 F test/minmax.test 5d56f08a7765dfb5c1fb303333f7444dacb37bef
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
-F test/minmax3.test 5b89f055df7ed03334e96eec0efb804afb7de638
+F test/minmax3.test 1b092b09965e596d31e2694e501a3c58a0df3894
 F test/misc1.test 1b89c02c4a33b49dee4cd1d20d161aaaba719075
 F test/misc2.test 1ee89298de9c16b61454658b24999c403e86afe4
 F test/misc3.test aea079f4c3d93e9962186f45c0ff0954310e6b11
@@ -413,7 +413,7 @@ F test/pager2.test c025f91b75fe65e85febda64d9416428b8a5cab5
 F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 51e3c091bc2992f5098f7576e3594e1908988939
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
-F test/pragma.test a16e6c08d4b85d1eb0ecfb490f6fa1e2d6342043
+F test/pragma.test aec802c9599db3ec887b5fd96f0b08958129303e
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test c3405535b418d454e8a52196a0fc592ec9eec58d
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P f87ddf83a5d1340652f222972a7d75f4fdbe776b
-R 4eff51fa0e2146019ac3cf43f90b51e7
+P 074ee55ffd1f0b7bb120a440d8bcf19e249ada96
+R bac1ef9b629a837280f01f7433baefc9
 U drh
-Z eaeb575bf3bebac1f6b6f099c0feb83e
+Z 6a01323dbd724dd5c8307094b92f096d
diff --git a/manifest.uuid b/manifest.uuid
index a5ae2854ff..6377c766b2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-074ee55ffd1f0b7bb120a440d8bcf19e249ada96
\ No newline at end of file
+24e769972eb6052b82dc94d20444c186a213e104
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 4019ca77a7..067426d11c 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.170 2008/02/13 18:25:27 danielk1977 Exp $
+** $Id: pragma.c,v 1.171 2008/03/19 00:21:31 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -937,6 +937,8 @@ void sqlite3Pragma(
             { OP_Concat,      5,  3,  3},
             { OP_Concat,      6,  3,  3},
             { OP_ResultRow,   3,  1,  0},
+            { OP_IfPos,       1,  0,  0},    /* 9 */
+            { OP_Halt,        0,  0,  0},
           };
           sqlite3GenerateIndexKey(pParse, pIdx, 1, 3);
           jmp2 = sqlite3VdbeAddOp3(v, OP_Found, j+2, 0, 3);
@@ -944,6 +946,7 @@ void sqlite3Pragma(
           sqlite3VdbeChangeP4(v, addr+1, "rowid ", P4_STATIC);
           sqlite3VdbeChangeP4(v, addr+3, " missing from index ", P4_STATIC);
           sqlite3VdbeChangeP4(v, addr+4, pIdx->zName, P4_STATIC);
+          sqlite3VdbeJumpHere(v, addr+9);
           sqlite3VdbeJumpHere(v, jmp2);
         }
         sqlite3VdbeAddOp2(v, OP_Next, 1, loopTop+1);
diff --git a/src/test2.c b/src/test2.c
index 153806cded..d326a91d88 100644
--- a/src/test2.c
+++ b/src/test2.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test2.c,v 1.54 2008/03/07 19:51:14 drh Exp $
+** $Id: test2.c,v 1.55 2008/03/19 00:21:31 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -717,8 +717,6 @@ int Sqlitetest2_Init(Tcl_Interp *interp){
      (char*)&sqlite3_diskfull, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite_pending_byte",
      (char*)&sqlite3_pending_byte, TCL_LINK_INT);
-  Tcl_LinkVar(interp, "pager_pagesize",
-     (char*)&test_pagesize, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite_pager_n_sort_bucket",
      (char*)&sqlite3_pager_n_sort_bucket, TCL_LINK_INT);
   return TCL_OK;
diff --git a/test/alter2.test b/test/alter2.test
index ebd5d54391..e56c976c24 100644
--- a/test/alter2.test
+++ b/test/alter2.test
@@ -13,7 +13,7 @@
 # file format change that may be used in the future to implement
 # "ALTER TABLE ... ADD COLUMN".
 #
-# $Id: alter2.test,v 1.12 2007/11/28 13:43:17 drh Exp $
+# $Id: alter2.test,v 1.13 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -22,8 +22,7 @@ source $testdir/tester.tcl
 # We have to have pragmas in order to do this test
 ifcapable {!pragma} return
 
-# These tests do not work if there is a codec.  The
-# btree_open command does not know how to handle codecs.
+# These tests do not work if there is a codec. 
 #
 #if {[catch {sqlite3 -has_codec} r] || $r} return
 
@@ -42,23 +41,17 @@ ifcapable {!pragma} return
 # to $newval. Also, the schema cookie is incremented.
 # 
 proc set_file_format {newval} {
-  set bt [btree_open test.db 10 0]
-  btree_begin_transaction $bt
-  set meta [btree_get_meta $bt]
-  lset meta 2 $newval                    ;# File format
-  lset meta 1 [expr [lindex $meta 1]+1]  ;# Schema cookie
-  eval "btree_update_meta $bt $meta"
-  btree_commit $bt
-  btree_close $bt
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
 }
 
 # This procedure returns the value of the file-format in file 'test.db'.
 # 
 proc get_file_format {{fname test.db}} {
-  set bt [btree_open $fname 10 0]
-  set meta [btree_get_meta $bt]
-  btree_close $bt
-  lindex $meta 2
+  return [hexio_get_int [hexio_read $fname 44 4]]
 }
 
 # This procedure sets the SQL statement stored for table $tbl in the
@@ -236,7 +229,9 @@ ifcapable trigger {
 # file format requires incrementing the schema cookie.
 #
 do_test alter2-4.1 {
+  db close
   set_file_format 5
+  sqlite3 db test.db
 } {}
 do_test alter2-4.2 {
   # We have to run two queries here because the Tcl interface uses
@@ -255,7 +250,7 @@ do_test alter2-4.2 {
   catchsql { SELECT * FROM sqlite_master; }
 } {1 {unsupported file format}}
 do_test alter2-4.3 {
-  sqlite3_errcode $::DB
+  sqlite3_errcode db
 } {SQLITE_ERROR}
 do_test alter2-4.4 {
   set ::DB [sqlite3_connection_pointer db]
@@ -264,7 +259,7 @@ do_test alter2-4.4 {
   }
 } {1 {unsupported file format}}
 do_test alter2-4.5 {
-  sqlite3_errcode $::DB
+  sqlite3_errcode db
 } {SQLITE_ERROR}
 
 #---------------------------------------------------------------------
@@ -275,6 +270,8 @@ set default_file_format [expr $SQLITE_DEFAULT_FILE_FORMAT==4 ? 4 : 1]
 ifcapable vacuum {
   do_test alter2-5.1 {
     set_file_format 2
+    db close
+    sqlite3 db test.db
     execsql {SELECT 1 FROM sqlite_master LIMIT 1;}
     get_file_format
   } {2}
@@ -296,7 +293,6 @@ do_test alter2-6.1 {
   db close
   set_file_format 2
   sqlite3 db test.db
-  set ::DB [sqlite3_connection_pointer db]
   get_file_format
 } {2}
 ifcapable attach {
diff --git a/test/alter3.test b/test/alter3.test
index 0c51940031..69efc50ec7 100644
--- a/test/alter3.test
+++ b/test/alter3.test
@@ -13,7 +13,7 @@
 # file format change that may be used in the future to implement
 # "ALTER TABLE ... ADD COLUMN".
 #
-# $Id: alter3.test,v 1.10 2007/10/09 08:29:32 danielk1977 Exp $
+# $Id: alter3.test,v 1.11 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -50,10 +50,7 @@ if {[catch {sqlite3 -has_codec} r] || $r} {
 # This procedure returns the value of the file-format in file 'test.db'.
 # 
 proc get_file_format {{fname test.db}} {
-  set bt [btree_open $fname 10 0]
-  set meta [btree_get_meta $bt]
-  btree_close $bt
-  lindex $meta 2
+  return [hexio_get_int [hexio_read $fname 44 4]]
 }
 
 do_test alter3-1.1 {
diff --git a/test/capi3.test b/test/capi3.test
index 62046bcc08..f5712934dc 100644
--- a/test/capi3.test
+++ b/test/capi3.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the callback-free C/C++ API.
 #
-# $Id: capi3.test,v 1.59 2008/02/21 21:30:07 drh Exp $
+# $Id: capi3.test,v 1.60 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -635,17 +635,27 @@ do_test capi3-6.4-misuse {
 } {SQLITE_OK}
 db close
 
+# This procedure sets the value of the file-format in file 'test.db'
+# to $newval. Also, the schema cookie is incremented.
+# 
+proc set_file_format {newval} {
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
+}
+
+# This procedure returns the value of the file-format in file 'test.db'.
+# 
+proc get_file_format {{fname test.db}} {
+  return [hexio_get_int [hexio_read $fname 44 4]]
+}
+
 if {![sqlite3 -has-codec]} {
   # Test what happens when the library encounters a newer file format.
-  # Do this by updating the file format via the btree layer.
   do_test capi3-7.1 {
-    set ::bt [btree_open test.db 10 0]
-    btree_begin_transaction $::bt
-    set meta [btree_get_meta $::bt]
-    lset meta 2 5
-    eval [concat btree_update_meta $::bt [lrange $meta 0 end]]
-    btree_commit $::bt
-    btree_close $::bt
+    set_file_format 5
   } {}
   do_test capi3-7.2 {
     sqlite3 db test.db
@@ -660,8 +670,7 @@ if {![sqlite3 -has-codec]} {
   # Now test that the library correctly handles bogus entries in the
   # sqlite_master table (schema corruption).
   do_test capi3-8.1 {
-    file delete -force test.db
-    file delete -force test.db-journal
+    file delete -force test.db test.db-journal
     sqlite3 db test.db
     execsql {
       CREATE TABLE t1(a);
@@ -669,19 +678,12 @@ if {![sqlite3 -has-codec]} {
     db close
   } {}
   do_test capi3-8.2 {
-    set ::bt [btree_open test.db 10 0]
-    btree_begin_transaction $::bt
-    set ::bc [btree_cursor $::bt 1 1]
-
-    # Build a 5-field row record consisting of 5 null records. This is
-    # officially black magic.
-    catch {unset data}
-    set data [binary format c6 {6 0 0 0 0 0}]
-    btree_insert $::bc 5 $data
-
-    btree_close_cursor $::bc
-    btree_commit $::bt
-    btree_close $::bt
+    sqlite3 db test.db
+    execsql {
+      PRAGMA writable_schema=ON;
+      INSERT INTO sqlite_master VALUES(NULL,NULL,NULL,NULL,NULL);
+    }
+    db close
   } {}
   do_test capi3-8.3 {
     sqlite3 db test.db
@@ -690,28 +692,19 @@ if {![sqlite3 -has-codec]} {
     }
   } {1 {malformed database schema}}
   do_test capi3-8.4 {
-    set ::bt [btree_open test.db 10 0]
-    btree_begin_transaction $::bt
-    set ::bc [btree_cursor $::bt 1 1]
-  
     # Build a 5-field row record. The first field is a string 'table', and
-    # subsequent fields are all NULL. Replace the other broken record with
-    # this one and try to read the schema again. The broken record uses
-    # either UTF-8 or native UTF-16 (if this file is being run by
-    # utf16.test).
-    if { [string match UTF-16* $::ENC] } {
-      set data [binary format c6a10 {6 33 0 0 0 0} [utf16 table]]
-    } else {
-      set data [binary format c6a5 {6 23 0 0 0 0} table]
+    # subsequent fields are all NULL.
+    db close
+    file delete -force test.db test.db-journal
+    sqlite3 db test.db
+    execsql {
+      CREATE TABLE t1(a);
+      PRAGMA writable_schema=ON;
+      INSERT INTO sqlite_master VALUES('table',NULL,NULL,NULL,NULL);
     }
-    btree_insert $::bc 5 $data
-  
-    btree_close_cursor $::bc
-    btree_commit $::bt
-    btree_close $::bt
+    db close
   } {};
   do_test capi3-8.5 {
-    db close 
     sqlite3 db test.db
     catchsql {
       SELECT * FROM sqlite_master;
diff --git a/test/capi3c.test b/test/capi3c.test
index 6d7a6cc804..dcf026a91e 100644
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -13,7 +13,7 @@
 # This is a copy of the capi3.test file that has been adapted to
 # test the new sqlite3_prepare_v2 interface.
 #
-# $Id: capi3c.test,v 1.14 2008/01/19 23:50:26 drh Exp $
+# $Id: capi3c.test,v 1.15 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -594,10 +594,8 @@ set ::ENC [execsql {pragma encoding}]
 db close
 
 do_test capi3c-6.0 {
-btree_breakpoint
   sqlite3 db test.db
   set DB [sqlite3_connection_pointer db]
-btree_breakpoint
   sqlite3_key $DB xyzzy
   set sql {SELECT a FROM t1 order by rowid}
   set STMT [sqlite3_prepare_v2 $DB $sql -1 TAIL]
@@ -622,17 +620,27 @@ do_test capi3c-6.99-misuse {
   db close
 } {}
 
+# This procedure sets the value of the file-format in file 'test.db'
+# to $newval. Also, the schema cookie is incremented.
+# 
+proc set_file_format {newval} {
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
+}
+
+# This procedure returns the value of the file-format in file 'test.db'.
+# 
+proc get_file_format {{fname test.db}} {
+  return [hexio_get_int [hexio_read $fname 44 4]]
+}
+
 if {![sqlite3 -has-codec]} {
   # Test what happens when the library encounters a newer file format.
-  # Do this by updating the file format via the btree layer.
   do_test capi3c-7.1 {
-    set ::bt [btree_open test.db 10 0]
-    btree_begin_transaction $::bt
-    set meta [btree_get_meta $::bt]
-    lset meta 2 5
-    eval [concat btree_update_meta $::bt [lrange $meta 0 end]]
-    btree_commit $::bt
-    btree_close $::bt
+    set_file_format 5
   } {}
   do_test capi3c-7.2 {
     sqlite3 db test.db
@@ -647,8 +655,7 @@ if {![sqlite3 -has-codec]} {
   # Now test that the library correctly handles bogus entries in the
   # sqlite_master table (schema corruption).
   do_test capi3c-8.1 {
-    file delete -force test.db
-    file delete -force test.db-journal
+    file delete -force test.db test.db-journal
     sqlite3 db test.db
     execsql {
       CREATE TABLE t1(a);
@@ -656,19 +663,12 @@ if {![sqlite3 -has-codec]} {
     db close
   } {}
   do_test capi3c-8.2 {
-    set ::bt [btree_open test.db 10 0]
-    btree_begin_transaction $::bt
-    set ::bc [btree_cursor $::bt 1 1]
-
-    # Build a 5-field row record consisting of 5 null records. This is
-    # officially black magic.
-    catch {unset data}
-    set data [binary format c6 {6 0 0 0 0 0}]
-    btree_insert $::bc 5 $data
-
-    btree_close_cursor $::bc
-    btree_commit $::bt
-    btree_close $::bt
+    sqlite3 db test.db
+    execsql {
+      PRAGMA writable_schema=ON;
+      INSERT INTO sqlite_master VALUES(NULL,NULL,NULL,NULL,NULL);
+    }
+    db close
   } {}
   do_test capi3c-8.3 {
     sqlite3 db test.db
@@ -677,28 +677,19 @@ if {![sqlite3 -has-codec]} {
     }
   } {1 {malformed database schema}}
   do_test capi3c-8.4 {
-    set ::bt [btree_open test.db 10 0]
-    btree_begin_transaction $::bt
-    set ::bc [btree_cursor $::bt 1 1]
-  
     # Build a 5-field row record. The first field is a string 'table', and
-    # subsequent fields are all NULL. Replace the other broken record with
-    # this one and try to read the schema again. The broken record uses
-    # either UTF-8 or native UTF-16 (if this file is being run by
-    # utf16.test).
-    if { [string match UTF-16* $::ENC] } {
-      set data [binary format c6a10 {6 33 0 0 0 0} [utf16 table]]
-    } else {
-      set data [binary format c6a5 {6 23 0 0 0 0} table]
+    # subsequent fields are all NULL.
+    db close
+    file delete -force test.db test.db-journal
+    sqlite3 db test.db
+    execsql {
+      CREATE TABLE t1(a);
+      PRAGMA writable_schema=ON;
+      INSERT INTO sqlite_master VALUES('table',NULL,NULL,NULL,NULL);
     }
-    btree_insert $::bc 5 $data
-  
-    btree_close_cursor $::bc
-    btree_commit $::bt
-    btree_close $::bt
+    db close
   } {};
   do_test capi3c-8.5 {
-    db close 
     sqlite3 db test.db
     catchsql {
       SELECT * FROM sqlite_master;
diff --git a/test/descidx1.test b/test/descidx1.test
index 06ae533c8e..60cf969c51 100644
--- a/test/descidx1.test
+++ b/test/descidx1.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is descending indices.
 #
-# $Id: descidx1.test,v 1.9 2007/11/28 13:43:17 drh Exp $
+# $Id: descidx1.test,v 1.10 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -23,25 +23,20 @@ db eval {PRAGMA legacy_file_format=OFF}
 # to $newval. Also, the schema cookie is incremented.
 # 
 proc set_file_format {newval} {
-  set bt [btree_open test.db 10 0]
-  btree_begin_transaction $bt
-  set meta [btree_get_meta $bt]
-  lset meta 2 $newval                    ;# File format
-  lset meta 1 [expr [lindex $meta 1]+1]  ;# Schema cookie
-  eval "btree_update_meta $bt $meta"
-  btree_commit $bt
-  btree_close $bt
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
 }
 
 # This procedure returns the value of the file-format in file 'test.db'.
 # 
 proc get_file_format {{fname test.db}} {
-  set bt [btree_open $fname 10 0]
-  set meta [btree_get_meta $bt]
-  btree_close $bt
-  lindex $meta 2
+  return [hexio_get_int [hexio_read $fname 44 4]]
 }
 
+
 # Verify that the file format starts as 4.
 #
 do_test descidx1-1.1 {
diff --git a/test/descidx2.test b/test/descidx2.test
index 3c6b392b1f..69a88f1d6d 100644
--- a/test/descidx2.test
+++ b/test/descidx2.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is descending indices.
 #
-# $Id: descidx2.test,v 1.4 2006/07/11 14:17:52 drh Exp $
+# $Id: descidx2.test,v 1.5 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -23,25 +23,20 @@ db eval {PRAGMA legacy_file_format=OFF}
 # to $newval. Also, the schema cookie is incremented.
 # 
 proc set_file_format {newval} {
-  set bt [btree_open test.db 10 0]
-  btree_begin_transaction $bt
-  set meta [btree_get_meta $bt]
-  lset meta 2 $newval                    ;# File format
-  lset meta 1 [expr [lindex $meta 1]+1]  ;# Schema cookie
-  eval "btree_update_meta $bt $meta"
-  btree_commit $bt
-  btree_close $bt
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
 }
 
 # This procedure returns the value of the file-format in file 'test.db'.
 # 
 proc get_file_format {{fname test.db}} {
-  set bt [btree_open $fname 10 0]
-  set meta [btree_get_meta $bt]
-  btree_close $bt
-  lindex $meta 2
+  return [hexio_get_int [hexio_read $fname 44 4]]
 }
 
+
 # Verify that the file format starts as 4
 #
 do_test descidx2-1.1 {
diff --git a/test/descidx3.test b/test/descidx3.test
index 98b60e6de3..5cfd1f69f4 100644
--- a/test/descidx3.test
+++ b/test/descidx3.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is descending indices.
 #
-# $Id: descidx3.test,v 1.5 2006/07/11 14:17:52 drh Exp $
+# $Id: descidx3.test,v 1.6 2008/03/19 00:21:31 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -27,23 +27,17 @@ db eval {PRAGMA legacy_file_format=OFF}
 # to $newval. Also, the schema cookie is incremented.
 # 
 proc set_file_format {newval} {
-  set bt [btree_open test.db 10 0]
-  btree_begin_transaction $bt
-  set meta [btree_get_meta $bt]
-  lset meta 2 $newval                    ;# File format
-  lset meta 1 [expr [lindex $meta 1]+1]  ;# Schema cookie
-  eval "btree_update_meta $bt $meta"
-  btree_commit $bt
-  btree_close $bt
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
 }
 
 # This procedure returns the value of the file-format in file 'test.db'.
 # 
 proc get_file_format {{fname test.db}} {
-  set bt [btree_open $fname 10 0]
-  set meta [btree_get_meta $bt]
-  btree_close $bt
-  lindex $meta 2
+  return [hexio_get_int [hexio_read $fname 44 4]]
 }
 
 # Verify that the file format starts as 4.
diff --git a/test/minmax3.test b/test/minmax3.test
index 1ecef24cf1..c472233b99 100644
--- a/test/minmax3.test
+++ b/test/minmax3.test
@@ -8,7 +8,7 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# $Id: minmax3.test,v 1.1 2008/01/05 17:39:30 danielk1977 Exp $
+# $Id: minmax3.test,v 1.2 2008/03/19 00:21:31 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -24,26 +24,22 @@ proc count sql {
 # to $newval. Also, the schema cookie is incremented.
 # 
 proc set_file_format {newval} {
-  set bt [btree_open test.db 10 0]
-  btree_begin_transaction $bt
-  set meta [btree_get_meta $bt]
-  lset meta 2 $newval                    ;# File format
-  lset meta 1 [expr [lindex $meta 1]+1]  ;# Schema cookie
-  eval "btree_update_meta $bt $meta"
-  btree_commit $bt
-  btree_close $bt
+  hexio_write test.db 44 [hexio_render_int32 $newval]
+  set schemacookie [hexio_get_int [hexio_read test.db 40 4]]
+  incr schemacookie
+  hexio_write test.db 40 [hexio_render_int32 $schemacookie]
+  return {}
 }
 
-# Create the file as file-format 4 (DESC index support). This is 
-# required to exercise a few cases in where.c.
-#
-execsql { select * from sqlite_master }
-set_file_format 4
-
 do_test minmax3-1.0 {
   execsql {
-    BEGIN;
     CREATE TABLE t1(x, y, z);
+  }
+  db close
+  set_file_format 4
+  sqlite3 db test.db
+  execsql {
+    BEGIN;
     INSERT INTO t1 VALUES('1', 'I',   'one');
     INSERT INTO t1 VALUES('2', 'IV',  'four');
     INSERT INTO t1 VALUES('2', NULL,  'three');
@@ -141,4 +137,3 @@ do_test minmax3-1.4.4 {
 
 
 finish_test
-
diff --git a/test/pragma.test b/test/pragma.test
index af886e533e..f577f015aa 100644
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.58 2008/03/18 13:46:53 drh Exp $
+# $Id: pragma.test,v 1.59 2008/03/19 00:21:31 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -262,16 +262,17 @@ do_test pragma-3.1 {
 ifcapable attach {
   if {![sqlite3 -has-codec] && $sqlite_options(integrityck)} {
     do_test pragma-3.2 {
-      set rootpage [execsql {SELECT rootpage FROM sqlite_master WHERE name='i2'}]
-      set db [btree_open test.db 100 0]
-      btree_begin_transaction $db
-      set c [btree_cursor $db $rootpage 1]
-      btree_first $c
-      btree_delete $c
-      btree_commit $db
-      btree_close $db
+      db eval {SELECT rootpage FROM sqlite_master WHERE name='i2'} break
+      set pgsz [db eval {PRAGMA page_size}]
+      # overwrite the header on the rootpage of the index in order to
+      # make the index appear to be empty.
+      #
+      set offset [expr {$pgsz*($rootpage-1)}]
+      hexio_write test.db $offset 0a00000000040000000000
+      db close
+      sqlite3 db test.db
       execsql {PRAGMA integrity_check}
-    } {{rowid 1 missing from index i2} {wrong # of entries in index i2}}
+    } {{rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2}}
     do_test pragma-3.3 {
       execsql {PRAGMA integrity_check=1}
     } {{rowid 1 missing from index i2}}
@@ -280,22 +281,22 @@ ifcapable attach {
         ATTACH DATABASE 'test.db' AS t2;
         PRAGMA integrity_check
       }
-    } {{rowid 1 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2} {wrong # of entries in index i2}}
+    } {{rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2}}
     do_test pragma-3.5 {
       execsql {
-        PRAGMA integrity_check=3
+        PRAGMA integrity_check=4
       }
-    } {{rowid 1 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2}}
+    } {{rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2}}
     do_test pragma-3.6 {
       execsql {
         PRAGMA integrity_check=xyz
       }
-    } {{rowid 1 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2} {wrong # of entries in index i2}}
+    } {{rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2}}
     do_test pragma-3.7 {
       execsql {
         PRAGMA integrity_check=0
       }
-    } {{rowid 1 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2} {wrong # of entries in index i2}}
+    } {{rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2}}
   
     # Add additional corruption by appending unused pages to the end of
     # the database file testerr.db
@@ -326,7 +327,7 @@ ifcapable attach {
     } {{*** in database t2 ***
 Page 4 is never used
 Page 5 is never used
-Page 6 is never used} {rowid 1 missing from index i2} {wrong # of entries in index i2}}
+Page 6 is never used} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2}}
     do_test pragma-3.10 {
       execsql {
         PRAGMA integrity_check=1
@@ -340,7 +341,7 @@ Page 4 is never used}}
     } {{*** in database t2 ***
 Page 4 is never used
 Page 5 is never used
-Page 6 is never used} {rowid 1 missing from index i2} {wrong # of entries in index i2}}
+Page 6 is never used} {rowid 1 missing from index i2} {rowid 2 missing from index i2}}
     do_test pragma-3.12 {
       execsql {
         PRAGMA integrity_check=4
@@ -372,29 +373,29 @@ Page 5 is never used}}
     } {{*** in database t2 ***
 Page 4 is never used
 Page 5 is never used
-Page 6 is never used} {rowid 1 missing from index i2} {wrong # of entries in index i2} {*** in database t3 ***
+Page 6 is never used} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {*** in database t3 ***
 Page 4 is never used
 Page 5 is never used
-Page 6 is never used} {rowid 1 missing from index i2} {wrong # of entries in index i2}}
+Page 6 is never used} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2}}
     do_test pragma-3.16 {
       execsql {
-        PRAGMA integrity_check(9)
+        PRAGMA integrity_check(10)
       }
     } {{*** in database t2 ***
 Page 4 is never used
 Page 5 is never used
-Page 6 is never used} {rowid 1 missing from index i2} {wrong # of entries in index i2} {*** in database t3 ***
+Page 6 is never used} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {*** in database t3 ***
 Page 4 is never used
 Page 5 is never used
 Page 6 is never used} {rowid 1 missing from index i2}}
     do_test pragma-3.17 {
       execsql {
-        PRAGMA integrity_check=7
+        PRAGMA integrity_check=8
       }
     } {{*** in database t2 ***
 Page 4 is never used
 Page 5 is never used
-Page 6 is never used} {rowid 1 missing from index i2} {wrong # of entries in index i2} {*** in database t3 ***
+Page 6 is never used} {rowid 1 missing from index i2} {rowid 2 missing from index i2} {wrong # of entries in index i2} {*** in database t3 ***
 Page 4 is never used
 Page 5 is never used}}
     do_test pragma-3.18 {