From: dan <Dan Kennedy>
Date: Mon, 10 Jun 2024 19:45:33 +0000 (+0000)
Subject: Add missing calls to sqlite3exprSkipCollateAndLikely() to the enchancement on this... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df77e56cdeeb46fab3deb9ded4d5c0e873f57ee9;p=thirdparty%2Fsqlite.git

Add missing calls to sqlite3exprSkipCollateAndLikely() to the enchancement on this branch.

FossilOrigin-Name: 078537d057d638389e3ab3bc04bcac53f342c7bf1d8d75222296ef42d09e9ee7
---

diff --git a/manifest b/manifest
index 24efae1938..e555256083 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scrash\sthat\scould\soccur\swhen\sthe\sSELECT\sin\san\sEXISTS(SELECT\s...)\sused\san\sunknown\scollation\ssequence.
-D 2024-06-10T19:31:18.296
+C Add\smissing\scalls\sto\ssqlite3exprSkipCollateAndLikely()\sto\sthe\senchancement\son\sthis\sbranch.
+D 2024-06-10T19:45:33.614
 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 b3fa60ba7aab607daf0d15053a66073888f3dd8d6bb1c8000349bc22d85acd80
+F src/select.c 9c65721098bad3f2cf266ef8e6aa8c0d57a691a48c075d5e8b1a44fa4fa7e351
 F src/shell.c.in 77d12a0dab8724819e64a14d5fbaad91a934be2b22ad329708fba9ba78993f04
 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 7c0abb8383b492325d57e0546faf4ea52ad52c02877b797460330f17320a1314
+F test/existsexpr.test 6a917db207ca95a9da8733a2c3aefc8541f81d41169a69deb125a56686c73ed0
 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 a6365c778f2a6d6fa78e8520553373898f382ce73bf6496533e26291648ef5d1
-R 4addb7a3e408fa9c0e91b39c04b20512
+P f3009a6d7facd1ead520d588c5ad089db76d8641cd3dae076f2405492d7defcd
+R 93b078b964e586d7ff51ddb903d178e0
 U dan
-Z fa336d8505987cef2cdbba1866644a8f
+Z 3d590655f4ffe6769b9e658507fd34f2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f3378323f6..0d8e5a92ba 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3009a6d7facd1ead520d588c5ad089db76d8641cd3dae076f2405492d7defcd
\ No newline at end of file
+078537d057d638389e3ab3bc04bcac53f342c7bf1d8d75222296ef42d09e9ee7
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index ac8b1b6ae0..69a07528fa 100644
--- a/src/select.c
+++ b/src/select.c
@@ -7332,8 +7332,8 @@ static u64 findConstIdxTerms(
     m = findConstIdxTerms(pParse, iCsr, pIdx, pWhere->pLeft);
     m |= findConstIdxTerms(pParse, iCsr, pIdx, pWhere->pRight);
   }else if( pWhere->op==TK_EQ ){
-    Expr *pLeft = pWhere->pLeft;
-    Expr *pRight = pWhere->pRight;
+    Expr *pLeft = sqlite3ExprSkipCollateAndLikely(pWhere->pLeft);
+    Expr *pRight = sqlite3ExprSkipCollateAndLikely(pWhere->pRight);
     if( pRight->op==TK_COLUMN && pRight->iTable==iCsr ){
       SWAP(Expr*, pLeft, pRight);
     }
diff --git a/test/existsexpr.test b/test/existsexpr.test
index 836560f2d0..a5f60b944b 100644
--- a/test/existsexpr.test
+++ b/test/existsexpr.test
@@ -241,6 +241,35 @@ do_subquery_test 4.1 0 {
   D d
 }
 
+do_subquery_test 4.1.1 0 {
+  SELECT * FROM tx2 WHERE EXISTS (
+    SELECT 1 FROM tx1 WHERE (a COLLATE nocase)=x AND b=y
+  )
+} {
+  A a   b b   C c   D d
+}
+do_subquery_test 4.1.2 0 {
+  SELECT * FROM tx2 WHERE EXISTS (
+    SELECT 1 FROM tx1 WHERE a=x AND (b COLLATE binary)=y
+  )
+} {
+  A a   b b   C c   D d
+}
+do_subquery_test 4.1.1 0 {
+  SELECT * FROM tx2 WHERE EXISTS (
+    SELECT 1 FROM tx1 WHERE x=(a COLLATE nocase) AND b=y
+  )
+} {
+  A a   b b   C c   D d
+}
+do_subquery_test 4.1.2 0 {
+  SELECT * FROM tx2 WHERE EXISTS (
+    SELECT 1 FROM tx1 WHERE a=x AND y=(b COLLATE binary)
+  )
+} {
+  A a   b b   C c   D d
+}
+
 do_subquery_test 4.2 1 {
   SELECT * FROM tx2 WHERE EXISTS (
     SELECT 1 FROM tx1 WHERE a=x AND b=y COLLATE nocase