Correctly handle the case of a WHERE-clause term with indexed expressions on

both sides of the == sign.

FossilOrigin-Name: d9b716a6bd6145b2e7733c04d86227df777cd473

diff --git a/manifest b/manifest
index 36640d48c0c872bed962c7a96a8f7682ca1e4e54..96b2f90caf4628bd93580658d1fea2ec129e060b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sJSON1\stest\scase\sso\sthat\sit\sworks\son\sbuilds\sthat\somit\svirtual\stables.
-D 2015-09-24T11:06:26.506
+C Correctly\shandle\sthe\scase\sof\sa\sWHERE-clause\sterm\swith\sindexed\sexpressions\son\nboth\ssides\sof\sthe\s==\ssign.
+D 2015-09-24T11:26:45.688
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -417,7 +417,7 @@ F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
-F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
+F src/where.c 64a80b1c0a042488b4827844d5a438ee152f6e18
 F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
 F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
 F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
@@ -785,7 +785,7 @@ F test/index5.test 8621491915800ec274609e42e02a97d67e9b13e7
 F test/index6.test 7102ec371414c42dfb1d5ca37eb4519aa9edc23a
 F test/index7.test 9c6765a74fc3fcde7aebc5b3bd40d98df14a527c
 F test/indexedby.test 9c4cd331224e57f79fbf411ae245e6272d415985
-F test/indexexpr1.test b4dd422f6d0a515cbca6e0049d03a01f067b2bad
+F test/indexexpr1.test b750682e07d40bd0446082143f7ae2b1bf68e405
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
 F test/insert.test 38742b5e9601c8f8d76e9b7555f7270288c2d371
@@ -1388,7 +1388,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c43daa8c78df99f62dd4d3c83708a3a8eff92496
-R 58ea6ba9d04066436f9d8f6b2170ec8e
+P a4444c0f662058bdd5267e616c31cef828bc1fc5
+R c64af61f6d16f1b4c50f6ad30b9369d7
 U drh
-Z 759cfd5c38ee08c1a1303bbe88ed012d
+Z b270a072167f90d001d31028f02a3bdb

diff --git a/manifest.uuid b/manifest.uuid
index 3cc65b42027872561dc6c0c351db90f70e525dcf..e04a732b5d2643bac3ba88b465c943e283300f96 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a4444c0f662058bdd5267e616c31cef828bc1fc5
\ No newline at end of file
+d9b716a6bd6145b2e7733c04d86227df777cd473
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 69b7c064e8a664241ab6defe2e89052ae596b89e..39f99001fb6053cf158fc32b78740d08b74f7625 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -193,10 +193,9 @@ static WhereTerm *whereScanNext(WhereScan *pScan){
         ){
           if( (pTerm->eOperator & WO_EQUIV)!=0
            && pScan->nEquiv<ArraySize(pScan->aiCur)
+           && (pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight))->op==TK_COLUMN
           ){
             int j;
-            pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight);
-            assert( pX->op==TK_COLUMN );
             for(j=0; j<pScan->nEquiv; j++){
               if( pScan->aiCur[j]==pX->iTable
                && pScan->aiColumn[j]==pX->iColumn ){

diff --git a/test/indexexpr1.test b/test/indexexpr1.test
index 8748530c3f0c231f35f312c7dda2b337cf39ccbf..63940892d774ab8b2ed7914bd2791ebdc6567987 100644 (file)
--- a/test/indexexpr1.test
+++ b/test/indexexpr1.test
@@ -233,7 +233,13 @@ do_execsql_test indexexpr1-600 {
   SELECT i FROM t4 WHERE e=5;
 } {9}
 
-
-
+do_execsql_test indexexpr1-700 {
+  DROP TABLE IF EXISTS t7;
+  CREATE TABLE t7(a,b,c);
+  INSERT INTO t7(a,b,c) VALUES(1,2,2),('abc','def','def'),(4,5,6);
+  CREATE INDEX t7b ON t7(+b);
+  CREATE INDEX t7c ON t7(+c);
+  SELECT *, '|' FROM t7 WHERE +b=+c ORDER BY +a;
+} {1 2 2 | abc def def |}
 
 finish_test