Enhance the INTEGRITY_CHECK pragma to test the auxiliary database file in

addition to the main database file. (CVS 642)

FossilOrigin-Name: 52eba4de301121f254174b74042015bf6069ef11

diff --git a/manifest b/manifest
index 840334c534578e0157de9007f0a96f9b0077a3c3..9a8c90f5dd3fd9269f3c10827fc0c88f899c6acf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.5.2\s(CVS\s641)
-D 2002-06-25T01:09:31
+C Enhance\sthe\sINTEGRITY_CHECK\spragma\sto\stest\sthe\sauxiliary\sdatabase\sfile\sin\naddition\sto\sthe\smain\sdatabase\sfile.\s(CVS\s642)
+D 2002-06-25T13:16:03
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -20,7 +20,7 @@ F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F src/TODO af7f3cab0228e34149cf98e073aa83d45878e7e6
 F src/btree.c 6aaa67d7eab70c2531dc13e5d9eb87e626c0b4d7
 F src/btree.h 8abeabfe6e0b1a990b64fa457592a6482f6674f3
-F src/build.c 846eb3ee0e160e691766108a7136e196f8f8231b
+F src/build.c c288c2428ad34542d6357619f4c30d0a761fe55f
 F src/delete.c 44c45460b1e03033756e35adc6d569ffbf30b725
 F src/encode.c 346b12b46148506c32038524b95c4631ab46d760
 F src/expr.c cb50a72c491954d58be2f182366e45a1e252bf2e
@@ -52,7 +52,7 @@ F src/tokenize.c ac4c46f190346b87da54ec3e2605d160af80c619
 F src/trigger.c d88ab4d68d68955c217b38fb6717e090fbbf54a4
 F src/update.c 6f6a4dcd71cd9ff730b7f12c83de5498cde4924f
 F src/util.c 876b259f9186e84b944b72e793dd3dad50e63e95
-F src/vdbe.c 0b1ad7c3cbc638d1f73725bbc4e667c3ee8f7081
+F src/vdbe.c 17cdbcb692da2fbfcbb536a44b9fef88a92f5656
 F src/vdbe.h a9292f2b5fcecef924fa255fb74609e9cbc776c2
 F src/where.c 913fa33977c8dddfc259d9b2c38504b475738c43
 F test/all.test e4d3821eeba751829b419cd47814bd20af4286d1
@@ -60,20 +60,20 @@ F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
 F test/btree.test bf326f546a666617367a7033fa2c07451bd4f8e1
 F test/btree2.test e3b81ec33dc2f89b3e6087436dfe605b870c9080
 F test/btree3.test 9caa9e22491dd8cd8aa36d7ac3b48b089817c895
-F test/conflict.test 5149646703d3930c9111068b5cda7e2e938476e3
-F test/copy.test b3cefcb520c64d7e7dfedbab06b4d4c31fa5b99a
+F test/conflict.test 93ac51097a2cd51c85b4b68aea8cb6c3933b491f
+F test/copy.test 92e21ebea11319c3f70448d3763fdaa0e2f1c21f
 F test/delete.test c904a62129fe102b314a96111a8417f10249e4d8
 F test/expr.test c61a92f7d76d63d7379d58bc35245e156c9b63c3
 F test/func.test 628ab513b0d9c54251a63e026a26b7b4347e54ab
 F test/in.test c09312672e3f0709fa02c8e2e9cd8fb4bd6269aa
 F test/index.test c8a471243bbf878974b99baf5badd59407237cf3
-F test/insert.test 58d44c19b3557f67f4aeb5110ed9ef02038c3684
-F test/insert2.test eb8481878a7f52ccb4e3346f87550f5afdd77f76
+F test/insert.test a122afb86911e77c181d912348866a5b1a61eeab
+F test/insert2.test c288375a64dad3295044714f0dfed4a193cf067f
 F test/intpkey.test 69a6a9b41e541f27a2ffcd20264fb35adc3c2680
 F test/ioerr.test 57d9bffaca18b34f9e976f786eadc2591d6efc6a
 F test/join.test ea6a4097e4fcebbb16eac7ec819569e759336a74
 F test/limit.test 49b44e027a002c0ba336d723b448f07e05b04466
-F test/lock.test 3fcfd46a73119f6a18094673328a32c7b3047a8f
+F test/lock.test f1b55dc61632e99d241643cc8e7c03774f09f623
 F test/main.test c66b564554b770ee7fdbf6a66c0cd90329bc2c85
 F test/malloc.test 7ba32a9ebd3aeed52ae4aaa6d42ca37e444536fd
 F test/minmax.test 29bc5727c3e4c792d5c4745833dd4b505905819e
@@ -99,8 +99,8 @@ F test/table.test 42511f98a3e9bbee62913e3ae1774777faa23d35
 F test/tableapi.test 3c80421a889e1d106df16e5800fa787f0d2914a6
 F test/tclsqlite.test 79deeffd7cd637ca0f06c5dbbf2f44d272079533
 F test/temptable.test 9ed7ec0288f887e132de66d90c428ad109105f67
-F test/tester.tcl dc1b56bd628b487e4d75bfd1e7480b5ed8810ac6
-F test/trans.test ae0b9a82d5d34122c3a3108781eb8d078091ccee
+F test/tester.tcl 6f603d90881bd835ea27c568a7fecaa57dce91cc
+F test/trans.test 4eeb19975bb9607dce4fd4c0ef6723c2185c7d84
 F test/trigger1.test bb63749fa8a395a60541100607d86381604b7194
 F test/trigger2.test c12759a0d7ba6488d9d24c96a1352ddee995c1ab
 F test/trigger3.test 7dfe798d7e72c13720394685fe353112e3f31adf
@@ -137,7 +137,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ac64065d0c5e2de0f71238d55b2c14bb5c5c194c
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 9c1432bf7485258e485bd652e3acdaeabbfe8850
-R c96fc24249eaf46c6e1d5e0a79495140
+P 756310cad23668785eac679ef0842d1f37c306ee
+R 86bdc4dd43fde89d9869884f7454049a
 U drh
-Z a34cbc5c0ca8c33cec43575bd66d2fdb
+Z 4de554b1388a65f2a11731d055d158e3

diff --git a/manifest.uuid b/manifest.uuid
index 69af0247f9fb2e585d95e0f313670f27c7df0543..254e41f3220a94bc02b5d7185d7263304b4b8ae9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-756310cad23668785eac679ef0842d1f37c306ee
\ No newline at end of file
+52eba4de301121f254174b74042015bf6069ef11
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 3d4909741e8f59393e6fbc8668d1e5fb987bf872..f252b7838d0fd41862706fa77998223a1bddda8b 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -25,7 +25,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.98 2002/06/25 01:09:11 drh Exp $
+** $Id: build.c,v 1.99 2002/06/25 13:16:03 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2129,13 +2129,21 @@ void sqlitePragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){
       { OP_SetInsert,   0, 0,        "2"},
       { OP_Open,        0, 2,        0},
       { OP_Rewind,      0, 6,        0},
-      { OP_Column,      0, 3,        0},
+      { OP_Column,      0, 3,        0},    /* 3 */
       { OP_SetInsert,   0, 0,        0},
       { OP_Next,        0, 3,        0},
-      { OP_IntegrityCk, 0, 0,        0},
+      { OP_IntegrityCk, 0, 0,        0},    /* 6 */
       { OP_ColumnCount, 1, 0,        0},
       { OP_ColumnName,  0, 0,        "integrity_check"},
       { OP_Callback,    1, 0,        0},
+      { OP_SetInsert,   1, 0,        "2"},
+      { OP_OpenAux,     1, 2,        0},
+      { OP_Rewind,      1, 16,       0},
+      { OP_Column,      1, 3,        0},    /* 13 */
+      { OP_SetInsert,   1, 0,        0},
+      { OP_Next,        1, 13,       0},
+      { OP_IntegrityCk, 1, 1,        0},    /* 16 */
+      { OP_Callback,    1, 0,        0},
     };
     Vdbe *v = sqliteGetVdbe(pParse);
     if( v==0 ) return;

diff --git a/src/vdbe.c b/src/vdbe.c
index a706669b6b387a039df2453fc80624c76667b89c..48a8c7db8dff2f545fe096919dbf85e6d0df2300 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -30,7 +30,7 @@
 ** But other routines are also provided to help in building up
 ** a program instruction by instruction.
 **
-** $Id: vdbe.c,v 1.159 2002/06/25 01:09:12 drh Exp $
+** $Id: vdbe.c,v 1.160 2002/06/25 13:16:04 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -4019,14 +4019,17 @@ case OP_CreateTable: {
   break;
 }
 
-/* Opcode: IntegrityCk P1 * *
+/* Opcode: IntegrityCk P1 P2 *
 **
 ** Do an analysis of the currently open database.  Push onto the
 ** stack the text of an error message describing any problems.
 ** If there are no errors, push a "ok" onto the stack.
 **
 ** P1 is the index of a set that contains the root page numbers
-** for all tables and indices in this database.
+** for all tables and indices in the main database file.
+**
+** If P2 is not zero, the check is done on the auxiliary database
+** file, not the main database file.
 **
 ** This opcode is used for testing purposes only.
 */
@@ -4049,12 +4052,12 @@ case OP_IntegrityCk: {
     aRoot[j] = atoi((char*)sqliteHashKey(i));
   }
   aRoot[j] = 0;
-  z = sqliteBtreeIntegrityCheck(pBt, aRoot, nRoot);
+  z = sqliteBtreeIntegrityCheck(pOp->p2 ? db->pBeTemp : pBt, aRoot, nRoot);
   if( z==0 || z[0]==0 ){
+    if( z ) sqliteFree(z);
     zStack[tos] = "ok";
     aStack[tos].n = 3;
     aStack[tos].flags = STK_Str | STK_Static;
-    if( z ) sqliteFree(z);
   }else{
     zStack[tos] = z;
     aStack[tos].n = strlen(z) + 1;

diff --git a/test/conflict.test b/test/conflict.test
index 8db98e820578e6667f2d93da031f3b6908f14986..4e0c8d485dfb0102415e8d709afc7d9b89302fcd 100644 (file)
--- a/test/conflict.test
+++ b/test/conflict.test
@@ -13,7 +13,7 @@
 # This file implements tests for the conflict resolution extension
 # to SQLite.
 #
-# $Id: conflict.test,v 1.11 2002/04/12 10:09:00 drh Exp $
+# $Id: conflict.test,v 1.12 2002/06/25 13:16:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -491,10 +491,6 @@ do_test conflict-8.6.1 {
   db changes
 } {3}
 
-do_test insert-99.1 {
-  set x [execsql {PRAGMA integrity_check}]
-  if {$x==""} {set x ok}
-  set x
-} {ok}
+integrity_check conflict-99.1
 
 finish_test

diff --git a/test/copy.test b/test/copy.test
index bd54548e0e279047bb77c96fa3eaac04b60449a5..0bb5dbcfba3e4de5696a5abef99d0336a7d1f23d 100644 (file)
--- a/test/copy.test
+++ b/test/copy.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the COPY statement.
 #
-# $Id: copy.test,v 1.10 2002/02/19 13:39:23 drh Exp $
+# $Id: copy.test,v 1.11 2002/06/25 13:16:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -226,12 +226,7 @@ do_test copy-5.7 {
   }
 } {0}
 
-do_test copy-6.0 {
-  set x [execsql {PRAGMA integrity_check}]
-  if {$x==""} {set x ok}
-  set x
-} {ok}
- 
+integrity_check copy-6.0
 
 # Cleanup 
 #

diff --git a/test/insert.test b/test/insert.test
index 01d24a608e93e6f761515a1058267eec33e93fa0..7a013a3de37440aebd06e89f056d561bc450470b 100644 (file)
--- a/test/insert.test
+++ b/test/insert.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the INSERT statement.
 #
-# $Id: insert.test,v 1.10 2002/04/12 13:11:53 drh Exp $
+# $Id: insert.test,v 1.11 2002/06/25 13:16:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -156,11 +156,7 @@ do_test insert-3.3 {
 do_test insert-3.4 {
   execsql {SELECT * FROM test2 WHERE f1=22 AND f2=-4.44}
 } {22 -4.44 hi abc-123 wham}
-do_test insert-3.5 {
-  set x [execsql {PRAGMA integrity_check}]
-  if {$x==""} {set x ok}
-  set x
-} {ok}
+integrity_check insert-3.5
 
 # Test of expressions in the VALUES clause
 #

diff --git a/test/insert2.test b/test/insert2.test
index f90c320304599108a8240e6cb641db70696125a5..8c30cb0ec9a597c4dc600032e940676c8167fc07 100644 (file)
--- a/test/insert2.test
+++ b/test/insert2.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the INSERT statement that takes is
 # result from a SELECT.
 #
-# $Id: insert2.test,v 1.9 2002/04/12 10:09:00 drh Exp $
+# $Id: insert2.test,v 1.10 2002/06/25 13:16:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -115,11 +115,7 @@ do_test insert2-2.3 {
   }
 } {hi 2 1}
 
-do_test insert2-3.0 {
-  set x [execsql {PRAGMA integrity_check}]
-  if {$x==""} {set x ok}
-  set x
-} {ok}
+integrity_check insert2-3.0
 
 # File table t4 with lots of data
 #
@@ -193,5 +189,6 @@ do_test insert2-3.7 {
 do_test insert2-3.8 {
   db changes
 } {159}
+integrity_check insert2-3.9
 
 finish_test

diff --git a/test/lock.test b/test/lock.test
index 685d02f0f938026beeb3de1913b0d335e88e28bd..1aff098d825995eed52c1461c08dd7eaf8522b25 100644 (file)
--- a/test/lock.test
+++ b/test/lock.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock.test,v 1.14 2002/05/10 13:14:08 drh Exp $
+# $Id: lock.test,v 1.15 2002/06/25 13:16:04 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -145,6 +145,7 @@ if {$::tcl_platform(platform)=="unix"} {
     set r
   } {0 2}
 }
+integrity_check lock-1.23
 
 # If one thread has a transaction another thread cannot start
 # a transaction.
@@ -231,6 +232,7 @@ do_test lock-2.7 {
   lappend r $msg
   lappend r $::callback_value
 } {0 {} {1 2 3}}
+integrity_check lock-2.8
 
 # Try to start two transactions in a row
 #
@@ -240,7 +242,7 @@ do_test lock-3.1 {
   execsql {ROLLBACK}
   lappend r $msg
 } {0 {}}
-
+integrity_check lock-3.2
 
 do_test lock-999.1 {
   rename db2 {}

diff --git a/test/tester.tcl b/test/tester.tcl
index bcda99d29ceff6f20b3045dd7a2279056b350251..1a25182a27f77a76ea58f54b5aeba8bfa70d05c2 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -11,7 +11,7 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.22 2002/03/06 22:01:37 drh Exp $
+# $Id: tester.tcl,v 1.23 2002/06/25 13:16:04 drh Exp $
 
 # Make sure tclsqlite was compiled correctly.  Abort now with an
 # error message if not.
@@ -217,3 +217,11 @@ proc forcedelete {filename} {
     exec rm -rf $filename
   }
 }
+
+# Do an integrity check of the entire database
+#
+proc integrity_check {name} {
+  do_test $name {
+    execsql {PRAGMA integrity_check}
+  } {ok ok}
+}

diff --git a/test/trans.test b/test/trans.test
index 63902b0384ec054ffe2aee800cce8458ececd286..839f552c2b41f04ba47dfb3b5ec4bc62c346a9f8 100644 (file)
--- a/test/trans.test
+++ b/test/trans.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: trans.test,v 1.11 2002/03/11 02:06:14 drh Exp $
+# $Id: trans.test,v 1.12 2002/06/25 13:16:04 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -45,6 +45,7 @@ do_test trans-1.9 {
 do_test trans-1.10 {
   execsql {SELECT b FROM two ORDER BY a} altdb
 } {I V X}
+integrity_check trans-1.11
 
 # Basic transactions
 #
@@ -80,6 +81,7 @@ do_test trans-2.10 {
     END;
   }
 } {1 2 3 1 5 10}
+integrity_check trans-2.11
 
 # Check the locking behavior
 #
@@ -164,6 +166,7 @@ do_test trans-3.14 {
   } db} msg]
   lappend v $msg
 } {0 {1 2 3 4}}
+integrity_check trans-3.15
 
 do_test trans-4.1 {
   set v [catch {execsql {
@@ -234,13 +237,15 @@ do_test trans-4.11 {
   } altdb} msg]
   lappend v $msg
 } {0 {1 2 3 4}}
-do_test trans-4.99 {
+integrity_check trans-4.12
+do_test trans-4.98 {
   altdb close
   execsql {
     DROP TABLE one;
     DROP TABLE two;
   }
 } {}
+integrity_check trans-4.99
 
 # Check out the commit/rollback behavior of the database
 #
@@ -405,6 +410,8 @@ do_test trans-5.23 {
     SELECT * FROM t2;
   }
 } {1 2 3}
+integrity_check trans-5.23
+
 
 # Try to DROP and CREATE tables and indices with the same name
 # within a transaction.  Make sure ROLLBACK works.
@@ -663,6 +670,7 @@ do_test trans-6.39 {
     SELECT * FROM t1 WHERE c<1;
   }
 } {1 -2 -3 4 -5 -6}
+integrity_check trans-6.40
 
 # Test to make sure rollback restores the database back to its original
 # state.
@@ -770,6 +778,7 @@ do_test trans-7.13 {
 do_test trans-7.14 {
   execsql {SELECT md5sum(type,name,tbl_name,rootpage,sql) FROM sqlite_master}
 } $checksum2
+integrity_check trans-7.15
 
 # Arrange for another process to begin modifying the database but abort
 # and die in the middle of the modification.  Then have this process read
@@ -794,6 +803,7 @@ do_test trans-8.1 {
 do_test trans-8.2 {
   execsql {SELECT md5sum(type,name,tbl_name,rootpage,sql) FROM sqlite_master}
 } $checksum2
+integrity_check trans-8.3
 
    
 finish_test