Tweaks in support of VDBE branch test coverage.

FossilOrigin-Name: b97825646996792d0a67b83f135658027c8569ca

diff --git a/manifest b/manifest
index 03e22ae49a7b5ac8109a9e0237c627d969f660d5..21d08689e4c7174e79c40acee1d62f96d1fc1fb0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sVDBE\sbranch\saccounting\son\scomparison\soperators.
-D 2014-02-18T11:31:59.914
+C Tweaks\sin\ssupport\sof\sVDBE\sbranch\stest\scoverage.
+D 2014-02-19T00:53:46.757
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -156,7 +156,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 829d67a359b7c5d37120be994af2c0eac730070c
+F src/alter.c 1a630c6579b05d93530d4289182a4e8449e722f2
 F src/analyze.c 69761e1677142d180a9f55250dee2952f45e4793
 F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
@@ -171,7 +171,7 @@ F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd
 F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
-F src/delete.c a00bf893bd39868c51020eba1fc5182eb36bfeb7
+F src/delete.c cdd57149543bb28304d8f717c243f2a86b1fc280
 F src/expr.c 014b8087a15c4c314bdd798cb1cb0b32693f8b40
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 3cd6ce998404fb1b7203d886d6fdff71cf3c8846
@@ -1151,7 +1151,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P b92d31a97d5fe4606d9ae1393c7f3e052f46bf5a
-R ac3bce6c9f7bb42059d2e404010fd2bc
+P b287520c9226f7a9fab98142f5c207bfe959cd7e
+R db3eaca30cb3f9a4bcbd920e67b64796
 U drh
-Z fa645aebf1d7fefe7cb4cc20303fc9e2
+Z 6e0e07262b8661a34d8eb8aae8107f91

diff --git a/manifest.uuid b/manifest.uuid
index 5eb83b599d59b1bdaac588e2ce914b46a3270c8f..b1881b184d5af4f9ea03545ba1cecc649a91cace 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b287520c9226f7a9fab98142f5c207bfe959cd7e
\ No newline at end of file
+b97825646996792d0a67b83f135658027c8569ca
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index b8bf20cfd93b929e0a5e3711eb637b3df75ab896..7afce403dc10eebd7ef33f3f9cc95f05a0dbd254 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -604,7 +604,8 @@ void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){
     sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, r1, BTREE_FILE_FORMAT);
     sqlite3VdbeUsesBtree(v, iDb);
     sqlite3VdbeAddOp2(v, OP_Integer, minFormat, r2);
-    j1 = sqlite3VdbeAddOp3(v, OP_Ge, r2, 0, r1); VdbeCoverage(v);
+    j1 = sqlite3VdbeAddOp3(v, OP_Ge, r2, 0, r1);
+    sqlite3VdbeChangeP5(v, SQLITE_NULLEQ); VdbeCoverage(v);
     sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, r2);
     sqlite3VdbeJumpHere(v, j1);
     sqlite3ReleaseTempReg(pParse, r1);

diff --git a/src/delete.c b/src/delete.c
index 3fa41c53f0d41d676a3795abdf4b3fdbc1743f19..79e83cae527489ca61481b4f35c347a1cb416dfe 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -613,7 +613,8 @@ void sqlite3GenerateRowDelete(
   opSeek = HasRowid(pTab) ? OP_NotExists : OP_NotFound;
   if( !bNoSeek ){
     sqlite3VdbeAddOp4Int(v, opSeek, iDataCur, iLabel, iPk, nPk);
-    VdbeCoverage(v);
+    VdbeCoverageIf(v, opSeek==OP_NotExists);
+    VdbeCoverageIf(v, opSeek==OP_NotFound);
   }
  
   /* If there are any triggers to fire, allocate a range of registers to
@@ -656,7 +657,8 @@ void sqlite3GenerateRowDelete(
     */
     if( addrStart<sqlite3VdbeCurrentAddr(v) ){
       sqlite3VdbeAddOp4Int(v, opSeek, iDataCur, iLabel, iPk, nPk);
-      VdbeCoverage(v);
+      VdbeCoverageIf(v, opSeek==OP_NotExists);
+      VdbeCoverageIf(v, opSeek==OP_NotFound);
     }
 
     /* Do FK processing. This call checks that any FK constraints that