Pervent the likelihood() function from moving ON clause terms of a LEFT JOIN

into the WHERE clause.
Fix for ticket [5f60b11fc8e23490e2]

FossilOrigin-Name: ed96e14adce4a4f94cc6838c46bc97937c4cb72a

diff --git a/manifest b/manifest
index 213216a122455597a4fe8e016819c06736b96de4..4565c70b6369293552f4f2ca63575ab686c67f2a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Show\sthe\svalues\sof\sExpr.flag\sin\sthe\sAST\sof\s".selecttrace"
-D 2015-06-18T14:09:13.947
+C Pervent\sthe\slikelihood()\sfunction\sfrom\smoving\sON\sclause\sterms\sof\sa\sLEFT\sJOIN\ninto\sthe\sWHERE\sclause.\nFix\sfor\sticket\s[5f60b11fc8e23490e2]
+D 2015-06-18T14:32:51.732
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -250,7 +250,7 @@ F src/printf.c db11b5960105ee661dcac690f2ae6276e49bf251
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 45a814a755f90c1a6345164d2da4a8ef293da53d
+F src/select.c 15a17aff39e161d97deb880edc7e0527f01b2324
 F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 F src/sqlite.h.in 76d2f5637eb795b6300d9dd3c3ec3632ffafd721
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1209,7 +1209,7 @@ F test/whereC.test cae295158703cb3fc23bf1a108a9ab730efff0f6
 F test/whereD.test 9eba1f9b18e5b19a0b0bcaae5e8c037260195f2b
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
 F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
-F test/whereG.test 69f5ec4b15760a8c860f80e2d55525669390aab3
+F test/whereG.test a9fa7c84d7050b5a86a9ef94d343986d0b52ada1
 F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
 F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
 F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
@@ -1286,7 +1286,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 f50dd154d33c58d7a9aa1852fdc362c2e81feef2
-R 22636f96e0a5b958f11aa19ecbc51e6e
+P a84d1004cbee67f2b8ba1fd201e43af49ea67c1b
+R 530ba24618abbbf122ded3eb71849514
 U drh
-Z bfca8d78599e0b1cd1fa7858d0e8d79f
+Z 790eb5c98101c017e4fe81f6e31f872f

diff --git a/manifest.uuid b/manifest.uuid
index 93fb06574d291bc2c7ed119acb36a5fc1856b083..4391ae8b19a8d872e6ed34870785e326512b6714 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a84d1004cbee67f2b8ba1fd201e43af49ea67c1b
\ No newline at end of file
+ed96e14adce4a4f94cc6838c46bc97937c4cb72a
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index f030d2f4a441d911e2f6ff8a153ac367737ee5bd..e24b93b4b8218974a0e9f9b3cc1fbb1405db99a2 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -366,6 +366,12 @@ static void setJoinExpr(Expr *p, int iTable){
     assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
     ExprSetVVAProperty(p, EP_NoReduce);
     p->iRightJoinTable = (i16)iTable;
+    if( p->op==TK_FUNCTION && p->x.pList ){
+      int i;
+      for(i=0; i<p->x.pList->nExpr; i++){
+        setJoinExpr(p->x.pList->a[i].pExpr, iTable);
+      }
+    }
     setJoinExpr(p->pLeft, iTable);
     p = p->pRight;
   } 

diff --git a/test/whereG.test b/test/whereG.test
index c2c54db4553be23a1b6a94bed7e4144decf841aa..81416e14244de408f1bbf85a03b83e62820d8ebe 100644 (file)
--- a/test/whereG.test
+++ b/test/whereG.test
@@ -230,4 +230,19 @@ do_eqp_test 5.3.3 {
   SELECT * FROM t1 WHERE likely(a=?)
 } {0 0 0 {SCAN TABLE t1}}
 
+# 2015-06-18
+# Ticket [https://www.sqlite.org/see/tktview/472f0742a1868fb58862bc588ed70]
+#
+do_execsql_test 6.0 {
+  DROP TABLE IF EXISTS t1;
+  CREATE TABLE t1(i int, x, y, z);
+  INSERT INTO t1 VALUES (1,1,1,1), (2,2,2,2), (3,3,3,3), (4,4,4,4);
+  DROP TABLE IF EXISTS t2;
+  CREATE TABLE t2(i int, bool char);
+  INSERT INTO t2 VALUES(1,'T'), (2,'F');
+  SELECT count(*) FROM t1 LEFT JOIN t2 ON t1.i=t2.i AND bool='T';
+  SELECT count(*) FROM t1 LEFT JOIN t2 ON likely(t1.i=t2.i) AND bool='T';
+} {4 4}
+
+
 finish_test