Add a single new test case to the ORDER BY with IN logic verify that if the

RHS of the IN is a descending index that it still works.  Add testcase()
macros to the ORDER BY with IN logic to help verify that corner cases are
tested.

FossilOrigin-Name: 7e7356f1552cd53ea363d1ded3b2c221c9d0be01

diff --git a/manifest b/manifest
index 8f607ca689f0d1e1f17ed67f5ef252646771cacf..18f233c95af2c37c850f957db5dc7ff1b9d7ac49 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\scase\sthat\shad\san\sambiguous\sresult.
-D 2013-03-12T22:13:33.818
+C Add\sa\ssingle\snew\stest\scase\sto\sthe\sORDER\sBY\swith\sIN\slogic\sverify\sthat\sif\sthe\nRHS\sof\sthe\sIN\sis\sa\sdescending\sindex\sthat\sit\sstill\sworks.\s\sAdd\stestcase()\nmacros\sto\sthe\sORDER\sBY\swith\sIN\slogic\sto\shelp\sverify\sthat\scorner\scases\sare\ntested.
+D 2013-03-12T23:58:42.037
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -252,7 +252,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
 F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
-F src/where.c 6fdacd2cd56995aaef80209f2697d97a92d6a96f
+F src/where.c bdbbfa7ef4ea04c8d9b09585b45d4717a72f980a
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -778,7 +778,7 @@ F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
 F test/tkt-3a77c9714e.test 32bb28afa8c63fc76e972e996193139b63551ed9
 F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
 F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
-F test/tkt-4dd95f6943.test 906062d9d09a9373f4db23d07afc91efab792149
+F test/tkt-4dd95f6943.test b7fad82ce61a2650fa4861f903ee002c253730c3
 F test/tkt-54844eea3f.test a12b851128f46a695e4e378cca67409b9b8f5894
 F test/tkt-5d863f876e.test c9f36ca503fa154a3655f92a69d2c30da1747bfa
 F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84
@@ -1038,7 +1038,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 62316ebaca933f7e5df2018e8360a2b74234f30a
-R 79ce1fde79ba1a1f337a01fab19de6ab
+P 38c6bddf8cf15fb358858da6da457046f40b61ce
+R 2dfce1e78b3d8600ba8f21b6bcbf51de
 U drh
-Z ee8768f6007874088c82d4e86c289fa1
+Z 8bb717049072de8821087ba5a31c44c6

diff --git a/manifest.uuid b/manifest.uuid
index c3b3020b8cc51bf4cd106366dc7a4a5a5eea068d..1339ff13661a766eaf6cd3a405a5f940b41aae86 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38c6bddf8cf15fb358858da6da457046f40b61ce
\ No newline at end of file
+7e7356f1552cd53ea363d1ded3b2c221c9d0be01
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index d570b239c2f821ba2908a3cc051371cb399d2a19..25f3d4c54d97baaae62fbb96bbd8eb556ccfe921 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3799,12 +3799,19 @@ static int codeEqualityTerm(
     if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 
       && pLevel->plan.u.pIdx->aSortOrder[iEq]
     ){
+      testcase( iEq==0 );
+      testcase( iEq==pLevel->plan.u.pIdx->nColumn-1 );
+      testcase( iEq>0 && iEq+1<pLevel->plan.u.pIdx->nColumn );
+      testcase( bRev );
       bRev = !bRev;
     }
     assert( pX->op==TK_IN );
     iReg = iTarget;
     eType = sqlite3FindInIndex(pParse, pX, 0);
-    if( eType==IN_INDEX_INDEX_DESC ) bRev = !bRev;
+    if( eType==IN_INDEX_INDEX_DESC ){
+      testcase( bRev );
+      bRev = !bRev;
+    }
     iTab = pX->iTable;
     sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iTab, 0);
     assert( pLevel->plan.wsFlags & WHERE_IN_ABLE );

diff --git a/test/tkt-4dd95f6943.test b/test/tkt-4dd95f6943.test
index 8fd6bc80743190546f55b3541abb2ee5d24e9783..6590118370de5a5da2a6875606011f50cb7bba47 100644 (file)
--- a/test/tkt-4dd95f6943.test
+++ b/test/tkt-4dd95f6943.test
@@ -86,5 +86,16 @@ foreach {tn1 idx} {
   }
 }
 
-finish_test
+do_execsql_test 3.0 {
+  CREATE TABLE t7(x);
+  INSERT INTO t7 VALUES (1), (2), (3);
+  CREATE INDEX i7 ON t7(x);
+
+  CREATE TABLE t8(y);
+  INSERT INTO t8 VALUES (1), (2), (3);
 
+  CREATE UNIQUE INDEX i8 ON t8(y DESC);
+  SELECT x FROM t7 WHERE x IN (SELECT y FROM t8) ORDER BY x ASC;
+} {1 2 3}
+
+finish_test