From: dan <dan@noemail.net>
Date: Wed, 7 Sep 2016 19:37:20 +0000 (+0000)
Subject: Fix a problem handling expressions like "(a, b) IN (SELECT ... ORDER BY 1, 2)" when... 
X-Git-Tag: version-3.15.0~110^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frowvalue;p=thirdparty%2Fsqlite.git

Fix a problem handling expressions like "(a, b) IN (SELECT ... ORDER BY 1, 2)" when there is an index on "a" but not "b".

FossilOrigin-Name: 7f2c5c9ee3628c968306a5ab2e5a9a761f1b8055
---

diff --git a/manifest b/manifest
index 2b16d0533f..274df7eb97 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sthe\saffinity\shandling\slogic\sin\scodeAllEqualityTerms().\s\sLogically\nthe\ssame,\sjust\sa\slittle\seasier\sto\sread\sand\sunderstand.
-D 2016-09-07T13:30:40.808
+C Fix\sa\sproblem\shandling\sexpressions\slike\s"(a,\sb)\sIN\s(SELECT\s...\sORDER\sBY\s1,\s2)"\swhen\sthere\sis\san\sindex\son\s"a"\sbut\snot\s"b".
+D 2016-09-07T19:37:20.043
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -467,7 +467,7 @@ F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
 F src/where.c edbd73a87ba2e186928e9bfc14348b1bbb2628c5
 F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
-F src/wherecode.c 43522ac811e2e0374603f9fc9a3dda4e1a81f470
+F src/wherecode.c d172dcf99932ba698dd304edc9a368cd52b4b2e5
 F src/whereexpr.c e3db778ed205e982f31960896db71c50612ae009
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@ -1028,7 +1028,7 @@ F test/rowvalue5.test c1adfb2ea104e181f70d55bbd80d803b9917b22b
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
 F test/rowvalue7.test 5d06ff19d9e6969e574a2e662a531dd0c67801a8
 F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
-F test/rowvalue9.test 03a5edc94ab5983b98820f6541c62b43560cd84c
+F test/rowvalue9.test e24f9eb02baffc6a67b6eed9e40d4c612c98079d
 F test/rowvaluefault.test 7b16485e3f2b371f3e3d05455b8ded6d0c090244
 F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
 F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
@@ -1522,7 +1522,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 193f036c87857bd77577ceb462af5034c7cc77da
-R 5310dec13b5e77c999328204c9245316
-U drh
-Z 06433047ae27fe630ae84491904304f6
+P bbab9621f512b04684163b98b6fc669c68038044
+R 09b192e18dc26d97d5a589656b60205f
+U dan
+Z 3d9ebf68fced17edbc91ddfab98198fe
diff --git a/manifest.uuid b/manifest.uuid
index e850f3a033..a5783a2c58 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bbab9621f512b04684163b98b6fc669c68038044
\ No newline at end of file
+7f2c5c9ee3628c968306a5ab2e5a9a761f1b8055
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index fdb986cbdf..c440c56de3 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -445,8 +445,9 @@ static int codeEqualityTerm(
     if( (pX->flags & EP_xIsSelect)==0 || pX->x.pSelect->pEList->nExpr==1 ){
       eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, 0);
     }else{
+      Select *pSelect = pX->x.pSelect;
       sqlite3 *db = pParse->db;
-      ExprList *pOrigRhs = pX->x.pSelect->pEList;
+      ExprList *pOrigRhs = pSelect->pEList;
       ExprList *pOrigLhs = pX->pLeft->x.pList;
       ExprList *pRhs = 0;         /* New Select.pEList for RHS */
       ExprList *pLhs = 0;         /* New pX->pLeft vector */
@@ -463,6 +464,21 @@ static int codeEqualityTerm(
       }
       if( !db->mallocFailed ){
         Expr *pLeft = pX->pLeft;
+
+        if( pSelect->pOrderBy ){
+          /* If the SELECT statement has an ORDER BY clause, zero the 
+          ** iOrderByCol variables. These are set to non-zero when an 
+          ** ORDER BY term exactly matches one of the terms of the 
+          ** result-set. Since the result-set of the SELECT statement may
+          ** have been modified or reordered, these variables are no longer 
+          ** set correctly.  Since setting them is just an optimization, 
+          ** it's easiest just to zero them here.  */
+          ExprList *pOrderBy = pSelect->pOrderBy;
+          for(i=0; i<pOrderBy->nExpr; i++){
+            pOrderBy->a[i].u.x.iOrderByCol = 0;
+          }
+        }
+
         /* Take care here not to generate a TK_VECTOR containing only a
         ** single value. Since the parser never creates such a vector, some
         ** of the subroutines do not handle this case.  */
@@ -473,10 +489,10 @@ static int codeEqualityTerm(
           aiMap = (int*)sqlite3DbMallocZero(pParse->db, sizeof(int) * nEq);
           testcase( aiMap==0 );
         }
-        pX->x.pSelect->pEList = pRhs;
+        pSelect->pEList = pRhs;
         eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, aiMap);
         testcase( aiMap!=0 && aiMap[0]!=0 );
-        pX->x.pSelect->pEList = pOrigRhs;
+        pSelect->pEList = pOrigRhs;
         pLeft->x.pList = pOrigLhs;
         pX->pLeft = pLeft;
       }
diff --git a/test/rowvalue9.test b/test/rowvalue9.test
index 570a5b98a8..ce324f0b42 100644
--- a/test/rowvalue9.test
+++ b/test/rowvalue9.test
@@ -242,5 +242,61 @@ do_execsql_test 5.3 {
   SELECT rowid FROM e2 WHERE rowid IN (SELECT 0+c FROM e1);
 } {2}
 
+#-------------------------------------------------------------------------
+#
+do_execsql_test 6.0 {
+  CREATE TABLE f1(a, b);
+  CREATE TABLE f2(c, d);
+  CREATE TABLE f3(e, f);
+}
+
+do_execsql_test 6.1 {
+  SELECT * FROM f3 WHERE (e, f) IN (
+    SELECT a, b FROM f1 UNION ALL SELECT c, d FROM f2
+  );
+}
+do_execsql_test 6.2 {
+  CREATE INDEX f3e ON f3(e);
+  SELECT * FROM f3 WHERE (e, f) IN (
+    SELECT a, b FROM f1 UNION ALL SELECT c, d FROM f2
+  );
+}
+
+
+#-------------------------------------------------------------------------
+#
+do_execsql_test 7.0 {
+  CREATE TABLE g1(a, b); 
+  INSERT INTO g1 VALUES
+      (1, 1), (1, 2), (1, 3), (1, 'i'), (1, 'j'),
+      (1, 6), (1, 7), (1, 8), (1, 9), (1, 10),
+      (1, 4), (1, 5);
+
+  CREATE TABLE g2(x, y);
+  CREATE INDEX g2x ON g2(x);
+
+  INSERT INTO g2 VALUES(1, 4);
+  INSERT INTO g2 VALUES(1, 5);
+}
+
+do_execsql_test 7.1 {
+  SELECT * FROM g2 WHERE (x, y) IN (
+    SELECT a, b FROM g1 ORDER BY +a, +b LIMIT 10
+  );
+} { 1 4 1 5 }
+
+do_execsql_test 7.2 {
+  SELECT * FROM g2 WHERE (x, y) IN (
+    SELECT a, b FROM g1 ORDER BY a, b LIMIT 10
+  );
+} { 1 4 1 5 }
+
+do_execsql_test 7.3 {
+  SELECT * FROM g2 WHERE (x, y) IN (
+    SELECT a, b FROM g1 ORDER BY 1, 2 LIMIT 10
+  );
+} { 1 4 1 5 }
+
+
 finish_test