From: dan <Dan Kennedy>
Date: Wed, 12 Jun 2024 17:01:00 +0000 (+0000)
Subject: Do not attempt the exists-to-join optimization for expressions from the ON clause... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d92e66dfc42e23cf07fdf01b37f1bcbd0d8b6b9;p=thirdparty%2Fsqlite.git

Do not attempt the exists-to-join optimization for expressions from the ON clause of joins.

FossilOrigin-Name: 4666433cbd9af21c2e0440b10bcb39878624a39485e2bb514553b276acb8a401
---

diff --git a/manifest b/manifest
index 13e08125d6..beca64a81a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Provide\sthe\sability\sto\sdisable\sthe\sexists-to-join\soptimization\susing\nSQLITE_TESTCTRL_OPTIMIZATIONS.\s\sProvide\stree-trace\soutput\sfor\sthe\soptimization.
-D 2024-06-11T18:22:48.334
+C Do\snot\sattempt\sthe\sexists-to-join\soptimization\sfor\sexpressions\sfrom\sthe\sON\sclause\sof\sjoins.
+D 2024-06-12T17:01:00.926
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -755,7 +755,7 @@ F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 9c7786f032dea81487e7d94cb17849936f0e9b8891bfc91a6ac24ab193762804
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c decd5944639f604eba66bcf28161c1beb09b7762093aadc25313a0fe62ce9a5f
+F src/select.c 757ea788e20f608d09bfef209d17bba87104cab920f80de77c92b38588ef64c5
 F src/shell.c.in ad27d1d990e9e5fb7ae8fc38a717e91f55233714f59723e5618baf4a2a3d2b65
 F src/sqlite.h.in cbd3e4177791a61c056fd81e37a5b21bb6c8cb2ea8cac558c625974673f50acf
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1114,7 +1114,7 @@ F test/exclusive.test 7ff63be7503990921838d5c9f77f6e33e68e48ed1a9d48cd28745bf650
 F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
-F test/existsexpr.test 6a917db207ca95a9da8733a2c3aefc8541f81d41169a69deb125a56686c73ed0
+F test/existsexpr.test bf1201621070e79c1060c1a8cf7d65d81fc6b336d94a371c63ecb08d357af2fd
 F test/existsfault.test ff41c11f3052c1bbd4f8dd557802310026253d67d7c4e3a180c16d2f0862973e
 F test/expr.test 5c06696478212e5a04e04b043f993373f6f8e5ce5a80f5548a84703b123b6caa
 F test/expr2.test c27327ae9c017a7ff6280123f67aff496f912da74d78c888926d68b46ec75fd8
@@ -2197,8 +2197,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5f25a9518a675efbd0525cc2f5595ee7bc7122be7cfecdf6b20c909185dea370
-R b17f1837a5067fb4548e9e703c412c5a
-U drh
-Z e7e7ba1dc895b6e1b772b1a24ff19dc3
+P 33a3f327855b427ae6ba0057218d043a1417bc9d780728f47f23acdd836e1686
+R 25697789cb2a6d5a3b4b0fd17d4887cd
+U dan
+Z c7e8e1ad09260243da52b623b6dff2b7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f005164c32..26bcc7370b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-33a3f327855b427ae6ba0057218d043a1417bc9d780728f47f23acdd836e1686
\ No newline at end of file
+4666433cbd9af21c2e0440b10bcb39878624a39485e2bb514553b276acb8a401
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index e546a664cd..7a789196b6 100644
--- a/src/select.c
+++ b/src/select.c
@@ -7382,7 +7382,11 @@ static u64 findConstIdxTerms(
 **      WHERE S.sid = R.sid AND R.day = '2022-10-25';
 */
 static void existsToJoin(Parse *pParse, Select *p, Expr *pWhere){
-  if( pWhere && p->pSrc->nSrc>0 && pParse->db->mallocFailed==0 ){
+  if( pWhere 
+   && !ExprHasProperty(pWhere, EP_OuterON|EP_InnerON) 
+   && p->pSrc->nSrc>0 
+   && pParse->db->mallocFailed==0 
+  ){
     if( pWhere->op==TK_AND ){
       Expr *pRight = pWhere->pRight;
       existsToJoin(pParse, p, pWhere->pLeft);
diff --git a/test/existsexpr.test b/test/existsexpr.test
index a5f60b944b..81aa5799f0 100644
--- a/test/existsexpr.test
+++ b/test/existsexpr.test
@@ -404,6 +404,23 @@ do_catchsql_test 6.1 {
   SELECT a FROM t1 WHERE EXISTS (SELECT 1 FROM t2 WHERE c COLLATE f = a)
 } {1 {no such collation sequence: f}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 7.0 {
+  CREATE TABLE t1(x);
+  CREATE TABLE t2(y UNIQUE);
+
+  INSERT INTO t1 VALUES(1), (2);
+  INSERT INTO t2 VALUES(1), (3);
+
+  SELECT * FROM t1 one LEFT JOIN t1 two ON (one.x=two.x AND EXISTS (
+    SELECT 1 FROM t2 WHERE y=one.x
+  ));
+} {
+  1 1
+  2 {}
+}
+
 
 
 finish_test