Improvements to coverage testing. (CVS 3810)

FossilOrigin-Name: 38af156da83a8469080ddb75a9a286be33ff6bef

diff --git a/manifest b/manifest
index 774ec0fbabe2b661423e3a88e1958f62b503f315..ac7e70e021d5a24e6f935e3f9f557f76079f51c9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Catch\san\sIO\serror\scase\sintroduced\sby\s(3808).\s(CVS\s3809)
-D 2007-04-05T08:40:32
+C Improvements\sto\scoverage\stesting.\s(CVS\s3810)
+D 2007-04-05T11:25:58
 F Makefile.in 29fbf08ce0989973bfed0b5a052a6bdf3e60fd0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -60,7 +60,7 @@ F src/attach.c a16ada4a4654a0d126b8223ec9494ebb81bc5c3c
 F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f
 F src/btree.c 48fa58f2d71edeab4a7d08157abe50a0b7a0e489
 F src/btree.h 9b2cc0d113c0bc2d37d244b9a394d56948c9acbf
-F src/build.c ad3374b5409554e504300f77e1fbc6b4c106a57f
+F src/build.c 7c2efa468f0c404ef5aa648d43c383318390937f
 F src/callback.c 31d22b4919c7645cbcbb1591ce2453e8c677c558
 F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675
 F src/date.c c4930ef6afc2e9de12d51f800a8f750fac5ddb42
@@ -86,7 +86,7 @@ F src/os_unix.c 13c6f73a7b0c2c6c131c97ea26274db101b594cd
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c c9a99524d6b2bdec636264cad1b67553925e3309
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 90c1b538c55b55ab4344aea35dd00e64cb70a7fa
+F src/pager.c c92f45c8784976c058f5508a6fba0c623518206a
 F src/pager.h e79a24cf200b8771366217f5bca414f5b7823f42
 F src/parse.y 207ab04273ae13aa4a729b96008d294d5f334ab3
 F src/pragma.c 3b992b5b2640d6ae25cef05aa6a42cd1d6c43234
@@ -98,7 +98,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 3ae4654560e91220a95738a73d135d91d937cda1
 F src/sqlite.h.in e429f66f9245c7f8675db24b230c950b8672ad1c
 F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
-F src/sqliteInt.h 09384eb30d6740e3e9d0c9379432e254fdb390d9
+F src/sqliteInt.h f09f449f266f71b236844e540bfce10e455ba6ab
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c a8d1166319db5d505b25ac6a9820162afe63fc8a
 F src/test1.c 018c5fa3d98ac4ef364f671ef3752b793585f2fe
@@ -127,7 +127,7 @@ F src/vdbe.c 87e31f0790ac8a5aad7b7fcd5b97948943fccba3
 F src/vdbe.h 0025259af1939fb264a545816c69e4b5b8d52691
 F src/vdbeInt.h 4b19fd8febad3fd14c4c97adaefc06754d323132
 F src/vdbeapi.c 1fca7ff056d03f131caa6b1296bb221da65ed7f4
-F src/vdbeaux.c 2d58a815870923b008c6920f8dcb3f5c0594f54e
+F src/vdbeaux.c 0bae26de1ba1683de80c89ba1d4081b4c809d05b
 F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f
 F src/vdbemem.c 981a113405bd9b80aeb71fe246a2f01708e8a8f7
 F src/vtab.c 7fbda947e28cbe7adb3ba752a76ca9ef29936750
@@ -158,7 +158,7 @@ F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070
 F test/bigfile.test ebc9ce9216e08bead63734ab816d0f27858f3b80
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
 F test/bind.test 941a424e7722dd8994c2d503b28d00e6a8f87f23
-F test/bindxfer.test 6e2885965942acd110b18d1595ec39d5abc53d13
+F test/bindxfer.test b9a57f66dbd317feeefa28bd65b6576f1592ee98
 F test/blob.test 28c3b25150684ee3d108bb78cfb67a472deef2f0
 F test/btree.test 8b6168980efdd194289798f19d4c81434f6d3a66
 F test/btree2.test 4b56a2a4a4f84d68c77aef271223a713bf5ebafc
@@ -235,7 +235,7 @@ F test/in.test 369cb2aa1eab02296b4ec470732fe8c131260b1d
 F test/index.test e65df12bed94b2903ee89987115e1578687e9266
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test f66718cd92ce1216819d47e6a156755e4b2c4ca1
-F test/insert.test 42e26d9192f36859938765e6817fb957cf19532b
+F test/insert.test aef273dd1cee84cc92407469e6bd1b3cdcb76908
 F test/insert2.test 5a20e1ace5fa0800b58d28284212290189b49aed
 F test/insert3.test 09a532d5b6f3a788d91be0d4d368462f522685d1
 F test/insert4.test 0bb119fea2868afdcf78e4e3e3bfed27bbdb2430
@@ -303,7 +303,7 @@ F test/select5.test 0b47058d3e916c1fc9fe81f44b438e02bade21ce
 F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8
 F test/select7.test 95697d8e8355ef7538e2fe768da16838bbd0fcde
 F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5
-F test/shared.test 3ce96256ddeed110788d4a1e4b75bbd516f3ad5a
+F test/shared.test 315934fecff5ecb884449eaa5bae9876961f2f22
 F test/shared2.test 8b48f8d33494413ef4cf250110d89403e2bf6b23
 F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749
 F test/shared_err.test 841f7341eb07ed97c713bf89960a4e9199717193
@@ -450,7 +450,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 5180810eeaa3dfe3d934af0732a920ae117ec69f
-R fa9d750859a9dcc77798d46c4d2af406
-U danielk1977
-Z e261a0bded6d94427e4a7769f391adc9
+P 383a08e26083964e79bfe22156f5f554522fa1fb
+R 9a30b7d0568abab990c82d63357a749d
+U drh
+Z 5b2c71c22b4f98fd786d0cd9d3848570

diff --git a/manifest.uuid b/manifest.uuid
index 41619a7ba18650060aba1a0d8bd45291e491161f..d874ed0022a0c8ee9bd1ead023d95895bbf4606f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-383a08e26083964e79bfe22156f5f554522fa1fb
\ No newline at end of file
+38af156da83a8469080ddb75a9a286be33ff6bef
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index cc38cf72ec94978ee614db79c72a4843adc248dc..0557482efdef6428da10bfef57459b2fa6e9a86c 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.418 2007/03/29 05:51:49 drh Exp $
+** $Id: build.c,v 1.419 2007/04/05 11:25:58 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -442,17 +442,6 @@ void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){
   }
 }
 
-/*
-** This routine is called whenever a rollback occurs.  If there were
-** schema changes during the transaction, then we have to reset the
-** internal hash tables and reload them from disk.
-*/
-void sqlite3RollbackInternalChanges(sqlite3 *db){
-  if( db->flags & SQLITE_InternChanges ){
-    sqlite3ResetInternalSchema(db, 0);
-  }
-}
-
 /*
 ** This routine is called when a commit occurs.
 */

diff --git a/src/pager.c b/src/pager.c
index a0d6e0db2af2e8bba4752c603041032f0c2118d3..1fee905da530d1a277b17bc51b362a1164eccbaa 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.318 2007/04/05 08:40:32 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.319 2007/04/05 11:25:58 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -278,13 +278,15 @@ struct Pager {
   i64 stmtJSize;              /* Size of journal at stmt_begin() */
   int sectorSize;             /* Assumed sector size during rollback */
 #ifdef SQLITE_TEST
-  int nHit, nMiss, nOvfl;     /* Cache hits, missing, and LRU overflows */
-  int nRead,nWrite;           /* Database pages read/written */
+  int nHit, nMiss;            /* Cache hits and missing */
+  int nRead, nWrite;          /* Database pages read/written */
 #endif
   void (*xDestructor)(DbPage*,int); /* Call this routine when freeing pages */
   void (*xReiniter)(DbPage*,int);   /* Call this routine when reloading pages */
+#ifdef SQLITE_HAS_CODEC
   void *(*xCodec)(void*,void*,Pgno,int); /* Routine for en/decoding data */
   void *pCodecArg;            /* First argument to xCodec() */
+#endif
   int nHash;                  /* Size of the pager hash table */
   PgHdr **aHash;              /* Hash table to map page number to PgHdr */
 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
@@ -374,7 +376,7 @@ static const unsigned char aJournalMagic[] = {
 /*
 ** Enable reference count tracking (for debugging) here:
 */
-#ifdef SQLITE_TEST
+#ifdef SQLITE_DEBUG
   int pager3_refinfo_enable = 0;
   static void pager_refinfo(PgHdr *p){
     static int cnt = 0;
@@ -1857,9 +1859,6 @@ int sqlite3PagerSetPagesize(Pager *pPager, int pageSize){
 extern int sqlite3_io_error_pending;
 extern int sqlite3_io_error_hit;
 static int saved_cnt;
-void clear_simulated_io_error(){
-  sqlite3_io_error_hit = 0;
-}
 void disable_simulated_io_errors(void){
   saved_cnt = sqlite3_io_error_pending;
   sqlite3_io_error_pending = -1;
@@ -1868,7 +1867,6 @@ void enable_simulated_io_errors(void){
   sqlite3_io_error_pending = saved_cnt;
 }
 #else
-# define clear_simulated_io_error()
 # define disable_simulated_io_errors()
 # define enable_simulated_io_errors()
 #endif
@@ -2592,9 +2590,7 @@ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){
   /* Unlink the old page from the free list and the hash table
   */
   unlinkPage(pPg);
-  if( pPg && pPg->pgno!=0 ){
-    TEST_INCR(pPager->nOvfl);
-  }
+  assert( pPg->pgno==0 );
 
   *ppPg = pPg;
   return SQLITE_OK;
@@ -3948,7 +3944,7 @@ int *sqlite3PagerStats(Pager *pPager){
   a[5] = pPager->errCode;
   a[6] = pPager->nHit;
   a[7] = pPager->nMiss;
-  a[8] = pPager->nOvfl;
+  a[8] = 0;  /* Used to be pPager->nOvfl */
   a[9] = pPager->nRead;
   a[10] = pPager->nWrite;
   return a;
@@ -4101,6 +4097,7 @@ int sqlite3PagerNosync(Pager *pPager){
   return pPager->noSync;
 }
 
+#ifdef SQLITE_HAS_CODEC
 /*
 ** Set the codec for this pager
 */
@@ -4112,6 +4109,7 @@ void sqlite3PagerSetCodec(
   pPager->xCodec = xCodec;
   pPager->pCodecArg = pCodecArg;
 }
+#endif
 
 #ifndef SQLITE_OMIT_AUTOVACUUM
 /*

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 1e276d1abca07bf66591d8ab581b9710e05bc3a3..6374a97a74d6e6a4937bcde62f9f2141ca9d406e 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.548 2007/03/31 15:28:00 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.549 2007/04/05 11:25:59 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1610,7 +1610,6 @@ int sqlite3InitCallback(void*, int, char**, char**);
 void sqlite3Pragma(Parse*,Token*,Token*,Token*,int);
 void sqlite3ResetInternalSchema(sqlite3*, int);
 void sqlite3BeginParse(Parse*,int);
-void sqlite3RollbackInternalChanges(sqlite3*);
 void sqlite3CommitInternalChanges(sqlite3*);
 Table *sqlite3ResultSetOfSelect(Parse*,char*,Select*);
 void sqlite3OpenMasterTable(Parse *, int);

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 51447d755b63fa7f0a5ac80afc318a053574c0bc..064849a36a4ffaba45c7faf38ab27852f4687702 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -757,11 +757,11 @@ int sqlite3VdbeList(
 }
 #endif /* SQLITE_OMIT_EXPLAIN */
 
+#ifdef SQLITE_DEBUG
 /*
 ** Print the SQL that was used to generate a VDBE program.
 */
 void sqlite3VdbePrintSql(Vdbe *p){
-#ifdef SQLITE_DEBUG
   int nOp = p->nOp;
   VdbeOp *pOp;
   if( nOp<1 ) return;
@@ -771,8 +771,8 @@ void sqlite3VdbePrintSql(Vdbe *p){
     while( isspace(*(u8*)z) ) z++;
     printf("SQL: [%s]\n", z);
   }
-#endif
 }
+#endif
 
 #if !defined(SQLITE_OMIT_TRACE) && defined(SQLITE_ENABLE_IOTRACE)
 /*
@@ -1508,10 +1508,6 @@ void sqlite3VdbeResetStepResult(Vdbe *p){
 */
 int sqlite3VdbeReset(Vdbe *p){
   sqlite3 *db;
-  if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){
-    sqlite3Error(p->db, SQLITE_MISUSE, 0);
-    return SQLITE_MISUSE;
-  }
   db = p->db;
 
   /* If the VM did not run to completion or if it encountered an

diff --git a/test/bindxfer.test b/test/bindxfer.test
index b06b231a7d3ffaea0651e68097c944387e97be83..710ebc7f57e0aede30f1e7043835312fc2ca097d 100644 (file)
--- a/test/bindxfer.test
+++ b/test/bindxfer.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_transfer_bindings() API.
 #
-# $Id: bindxfer.test,v 1.3 2007/04/04 01:27:44 drh Exp $
+# $Id: bindxfer.test,v 1.4 2007/04/05 11:25:59 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -77,6 +77,8 @@ do_test bindxfer-1.10 {
   set VM2 [sqlite3_prepare $DB {SELECT ?, ?, ?, ?} -1 TAIL]
   sqlite3_transfer_bindings $VM1 $VM2
 } 1  ;# SQLITE_ERROR
+catch {sqlite3_finalize $VM1}
+catch {sqlite3_finalize $VM2}
 
 
 finish_test

diff --git a/test/insert.test b/test/insert.test
index 723a47d15dd6e9a744aec03aa17c2e943611d6df..9ea9cd727d52802a7be0c05a5bd31c5932141c46 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.30 2006/06/11 23:41:56 drh Exp $
+# $Id: insert.test,v 1.31 2007/04/05 11:25:59 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -362,6 +362,29 @@ ifcapable subquery&&compound {
   } {}
 }
 
+# Make sure the rowid cache in the VDBE is reset correctly when
+# an explicit rowid is given.
+#
+do_test insert-9.1 {
+  execsql {
+    CREATE TABLE t5(x);
+    INSERT INTO t5 VALUES(1);
+    INSERT INTO t5 VALUES(2);
+    INSERT INTO t5 VALUES(3);
+    INSERT INTO t5(rowid, x) SELECT nullif(x*2+10,14), x+100 FROM t5;
+    SELECT rowid, x FROM t5;
+  }
+} {1 1 2 2 3 3 12 101 13 102 16 103}
+do_test insert-9.2 {
+  execsql {
+    CREATE TABLE t6(x INTEGER PRIMARY KEY, y);
+    INSERT INTO t6 VALUES(1,1);
+    INSERT INTO t6 VALUES(2,2);
+    INSERT INTO t6 VALUES(3,3);
+    INSERT INTO t6 SELECT nullif(y*2+10,14), y+100 FROM t6;
+    SELECT x, y FROM t6;
+  }
+} {1 1 2 2 3 3 12 101 13 102 16 103}
 
 integrity_check insert-99.0
 

diff --git a/test/shared.test b/test/shared.test
index ee36e02ca17961d46ec02663742dbb0cf12fba23..8d57a4e5950845224c374220ee1429c2c019ae2a 100644 (file)
--- a/test/shared.test
+++ b/test/shared.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: shared.test,v 1.22 2007/04/04 01:27:44 drh Exp $
+# $Id: shared.test,v 1.23 2007/04/05 11:25:59 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -848,9 +848,11 @@ do_test shared-$av.11.8 {
   }
   set res
 } {1 4 {} 7}
-do_test shared-$av.11.9 {
-  sqlite_shared_cache_report 
-} [list [file normalize test.db] 2]
+if {[llength [info command sqlite_shared_cache_report]]==1} {
+  do_test shared-$av.11.9 {
+    sqlite_shared_cache_report 
+  } [list [file normalize test.db] 2]
+}
 
 do_test shared-$av.11.11 {
   db close