Remove an ALWAYS() that can now be false due to the prior check-in.

FossilOrigin-Name: 3bfdb4103d83365c32fb5497004948299399e403096cd3001e775b029a1cd8eb

diff --git a/manifest b/manifest
index 761c8397adabcd69c50bd3ca1e715cba5767825c..7b713e9ef5977db2cc294dee1c608d2786856d13 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sfunction\sthat\sdetermines\sthe\scollating\sfunction\sfor\san\sexpression\ntree\sto\shandle\snew\scases\sthat\sarise\sas\sa\sresult\sof\sthe\srecently\sadded\nability\sto\suse\sindexed\sexpressions\sin\saggregate\squeries.
-D 2023-04-05T02:25:37.619
+C Remove\san\sALWAYS()\sthat\scan\snow\sbe\sfalse\sdue\sto\sthe\sprior\scheck-in.
+D 2023-04-05T03:00:34.378
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
-F src/expr.c 9cada96745a63c93ae3ab13dff39125197a791306a1076db9c5616de41093cf5
+F src/expr.c d16a20b500fb71fcca674e7c0a4ef0b53a48c2d28908bc1fafcef993b4f7436e
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
@@ -1163,7 +1163,7 @@ F test/hook2.test b9ff3b8c6519fb67f33192f1afe86e7782ee4ac8
 F test/icu.test 716a6b89fbabe5cc63e0cd4c260befb08fd7b9d761f04d43669233292f0753b1
 F test/ieee754.test b0945d12be7d255f3dfa18e2511b17ca37e0edd2b803231c52d05b86c04ab26e
 F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
-F test/in.test 291d881deae63fc2f0f3a9d7fdc1d300db58a6812c08e7c0370c970a984ecfbf
+F test/in.test d1cad4ededd425568b2e39fb0c31fa9a3772311dd595801ff13ba3912b69bba6
 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
 F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
 F test/in4.test fdd1d8134da8376985c2edba6035a2de1f6c731524d2ffa651419e8fe2cd1c5a
@@ -2046,9 +2046,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 80d518fb82ff8d837a35280460242ebb925c112024c29496d1804768a4c3efe8
-Q +cc5041f3f067cf610adffb868b4e2d1b5d248dc5a0ecc551339b670800ecb0ff
-R 2f8aa58e38c147ecf7397b873899cb20
+P b29dea0dae3110f7d5d87be7f9096427227563229ed4fe2aef7fc86639856fe4
+Q +68a1a837493a0bc5e0e0f2373ac76cb575078cec08990c017fdcb51a4ba363a1
+Q +fc68993501aaa7180f5457dcb3c296e5b199904a385d98e2bcad7854e34d428e
+R 7a4f79c319f2d6ffcabde096301da91d
 U drh
-Z aa0712d092c41692b64c9eee233e2c74
+Z 165802a5bc500d7a8a5a56f4dc7cd540
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4aacc93c75e0d632c0abb9694bd5987aff7aa3a1..6e77dcb3754469d15a34137704407e794c3d17f0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b29dea0dae3110f7d5d87be7f9096427227563229ed4fe2aef7fc86639856fe4
\ No newline at end of file
+3bfdb4103d83365c32fb5497004948299399e403096cd3001e775b029a1cd8eb
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 01f2cbcabf96ac1126978f803cef7331d4403859..2b641f411e98f4988bbd25d69fe793b652e9c940 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -281,7 +281,7 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, const Expr *pExpr){
         assert( !ExprUseXList(p) || p->x.pList==0 || p->pRight==0 );
         if( ExprUseXList(p) && p->x.pList!=0 && !db->mallocFailed ){
           int i;
-          for(i=0; ALWAYS(i<p->x.pList->nExpr); i++){
+          for(i=0; i<p->x.pList->nExpr; i++){
             if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){
               pNext = p->x.pList->a[i].pExpr;
               break;

diff --git a/test/in.test b/test/in.test
index 0fc7a4e2c1580c3e819e12827c43650dc5141b13..601c7e3b4d042b2b7973cd9788ce7fb19035a0bf 100644 (file)
--- a/test/in.test
+++ b/test/in.test
@@ -842,6 +842,12 @@ do_execsql_test in-23.0 {
    GROUP BY a0.a
   HAVING (SELECT sum( (a1.a == +a0.a COLLATE NOCASE) IN (SELECT b FROM t4)));
 } {ABC abc,ABC,def abc abc,ABC,def def abc,ABC,def}
+do_execsql_test in-23.0-b {
+  SELECT a0.a, group_concat(a1.a) AS b
+    FROM t4 AS a0 JOIN t4 AS a1
+   GROUP BY a0.a
+  HAVING (SELECT sum( (a1.a GLOB +a0.a COLLATE NOCASE) IN (SELECT b FROM t4)));
+} {ABC abc,ABC,def abc abc,ABC,def def abc,ABC,def}
 #
 # Follow-up forum/forumpost/0713a16a44
 #