Add testcase() macros to ensure good test coverage.

FossilOrigin-Name: 5c132592820e9dc2355e26ea14e155c797c335b3

diff --git a/manifest b/manifest
index 67d3608db63f9f0dbe216bb5abfb78e8f8ccdfd8..dd2d1469f9b1e47db6a5583523963f5b0010af86 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\stest\scases\sfor\sthe\sOR\soptimization.
-D 2011-10-07T16:08:28.818
+C Add\stestcase()\smacros\sto\sensure\sgood\stest\scoverage.
+D 2011-10-07T17:45:58.914
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -251,7 +251,7 @@ F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 2e82da485ae1e037d2e372fd361c926cd4885934
+F src/where.c a6d127dd05daf0f9ffa654edfab4f1236dc759b7
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@ -967,7 +967,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 9fca05eac503d712886a05d03794f76c61fb39ed
-R bd6384414b9b60e15876987ee9f999e9
+P 4997d8b81cd3ea7c708911bfece00020d11224f9
+R b935363a5df75d52ae6d528d229f42f6
 U drh
-Z 427731fab44d769232d079e056d051e3
+Z e878c83927724d1c2481f6ca56873708

diff --git a/manifest.uuid b/manifest.uuid
index 937b15f8435efcb63c6097a9cc0a2f8d9abb13ef..661a2a46adbb9eb44e4a7e304a59caab270952b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4997d8b81cd3ea7c708911bfece00020d11224f9
\ No newline at end of file
+5c132592820e9dc2355e26ea14e155c797c335b3
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 9d5adc1832da02b0c767dfdde2ab3c8bd79f0684..da7ffbdf8682a17d7760a37801fa5ed6506d9b7c 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3032,6 +3032,7 @@ static void bestBtreeIndex(
       pTerm = findTerm(pWC, iCur, j, notReady, eqTermMask, pIdx);
       if( pTerm==0 ) break;
       wsFlags |= (WHERE_COLUMN_EQ|WHERE_ROWID_EQ);
+      testcase( pTerm->pWC!=pWC );
       if( pTerm->eOperator & WO_IN ){
         Expr *pExpr = pTerm->pExpr;
         wsFlags |= WHERE_COLUMN_IN;
@@ -3063,11 +3064,13 @@ static void bestBtreeIndex(
           nBound = 1;
           wsFlags |= WHERE_TOP_LIMIT;
           used |= pTop->prereqRight;
+          testcase( pTop->pWC!=pWC );
         }
         if( pBtm ){
           nBound++;
           wsFlags |= WHERE_BTM_LIMIT;
           used |= pBtm->prereqRight;
+          testcase( pBtm->pWC!=pWC );
         }
         wsFlags |= (WHERE_COLUMN_RANGE|WHERE_ROWID_RANGE);
       }