A formerly impossible case has now become possible because of the new

ExprIsConstant enhancements.  So deal with that.

FossilOrigin-Name: 9ba3cff9d48fe8fc8a0a51291169599209d464465e44bdfd60058fd1e314a2b1

diff --git a/manifest b/manifest
index bbd7c592ebb28912c7d173dbfd9d864df6b0f3ba..5a88394c422d3ccc3a707dc21d77ec6a007fc166 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sexpand\sthe\sscope\sof\susage\sfor\sthe\senhacement\sto\sexpr-is-constant.
-D 2024-03-16T20:15:34.449
+C A\sformerly\simpossible\scase\shas\snow\sbecome\spossible\sbecause\sof\sthe\snew\nExprIsConstant\senhancements.\s\sSo\sdeal\swith\sthat.
+D 2024-03-16T21:04:32.468
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -700,7 +700,7 @@ F src/date.c 126ba2ab10aeb2e7ba6e089b5f07b747c0625b8287f78b60da346eda8d23c875
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c 8968e7bef87f595a3e7a5a31b1ee849dd26b600cae9caae17d0bd151f7771eb3
+F src/expr.c eef4b58b1c5f488c7bd099af3a571ff32509d00a1c990f17c0bc5e752ed33462
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
 F src/func.c 4204c56196847faefef57fa14e43b8e4d65eb8d7e65318abe463472e3fd148cb
@@ -2179,8 +2179,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 f71b28f6713126745bca53e098dfe3444d4235d6a2b87ced5b333a7f0ee79be8
-R d3bfccf80dd34f5216cfa96d96bbce32
+P d7eadcf7dd089f0f4aa963c58f0df32edd951368c9906375fd62b0a61cd393b8
+R 8cf165d7d4e6171fbfcc63e324d78f15
 U drh
-Z d29542cf1f94495f6b9d8836a34942e6
+Z 950e1346eed1b73efa50ee1189a08fc5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ce44e01dd62366ca19edf3788814b49254f47a3c..3675f57590aec8ef351574fbdc4f16dace1f51b7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d7eadcf7dd089f0f4aa963c58f0df32edd951368c9906375fd62b0a61cd393b8
\ No newline at end of file
+9ba3cff9d48fe8fc8a0a51291169599209d464465e44bdfd60058fd1e314a2b1
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 4b312873f7b756feaea8a2aa01d3e0be006805a6..3ba07fb2dc5aafb25a5446c9683981559c964813 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -218,9 +218,10 @@ Expr *sqlite3ExprSkipCollateAndLikely(Expr *pExpr){
       assert( pExpr->x.pList->nExpr>0 );
       assert( pExpr->op==TK_FUNCTION );
       pExpr = pExpr->x.pList->a[0].pExpr;
-    }else{
-      assert( pExpr->op==TK_COLLATE );
+    }else if( pExpr->op==TK_COLLATE ){
       pExpr = pExpr->pLeft;
+    }else{
+      break;
     }
   }  
   return pExpr;