From: dan <Dan Kennedy>
Date: Sat, 16 Mar 2024 14:27:10 +0000 (+0000)
Subject: Fix exprNodeIsConstantFunction() so that it returns WRC_Continue, not WRC_Abort,... 
X-Git-Tag: version-3.46.0~123^2~10^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40514dd1f661ad05b679cda3df90ed4efd0133fc;p=thirdparty%2Fsqlite.git

Fix exprNodeIsConstantFunction() so that it returns WRC_Continue, not WRC_Abort, if the function really is constant.

FossilOrigin-Name: d85dd4de2d0989127e0ae6a2eec9d83a577777f8d5ba40700084a0b498016634
---

diff --git a/manifest b/manifest
index 5926610ec1..521628dfe1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\ssqlite3ExprIsConstant()\sfunction\sso\sthat\sit\srecognizes\nconstant\sfunctions.\s\sSo\sfar\sthe\senhancement\sonly\sapplies\sto\sthe\smulti-row\nVALUES\sclause,\sbut\sit\scould\spossibly\sbe\sapplied\sin\smany\sother\splaces.
-D 2024-03-16T13:18:48.351
+C Fix\sexprNodeIsConstantFunction()\sso\sthat\sit\sreturns\sWRC_Continue,\snot\sWRC_Abort,\sif\sthe\sfunction\sreally\sis\sconstant.
+D 2024-03-16T14:27:10.517
 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 023e84202023d58bc10cb1f7a4dcc7fe1342e11daa054ea1024e8b78144bd589
+F src/expr.c b3914ec5ac4f1c43d0743123fabab27c089f16dcfdcfd47973e2eebe0834f94b
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
 F src/func.c 4204c56196847faefef57fa14e43b8e4d65eb8d7e65318abe463472e3fd148cb
@@ -1921,7 +1921,7 @@ F test/vacuum4.test 7ea76b769fffeb41f925303b04cbcf5a5bbeabe55e4c60ae754ff24eeeb7
 F test/vacuum5.test 263b144d537e92ad8e9ca8a73cc6e1583f41cfd0dda9432b87f7806174a2f48c
 F test/vacuum6.test b137b04bf3392d3f5c3b8fda0ce85a6775a70ca112f6559f74ff52dc9ce042fd
 F test/vacuummem.test 4b30f5b95a9ff86e9d5c20741e50a898b2dc10b0962a3211571eb165357003fb
-F test/values.test f888bc7e833cc84258497f2c1b016f04515db00f9ee2e37ea12164eb9c8f47cf
+F test/values.test 60723a55f68e8e42027d49a159a1be8b92cb0f538a65cb363ff65637e8a41703
 F test/valuesfault.test 2ef23ed965e3bd08e268cdc38a0d11653390ddbbe1e8e2e98d16f55edd30f6e8
 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
@@ -2179,11 +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 823e579362c05bb8accf6c3b158c5162a16eb23cf81d6021c9e3246e32583d1c
-R 2ac63c110cf6a72c96a474d2b73e892b
-T *branch * enhanced-expr-is-const
-T *sym-enhanced-expr-is-const *
-T -sym-exp-values-clause2 *
-U drh
-Z 0a7dc94654580f17d6264250f37030ea
+P c9e0488c6c0135932b6e76b0f3f3acd69ef65327e0a54daa59777f35da1aef26
+R 073539ebd1c8b85d1f5a19f0731cb417
+U dan
+Z afcb8a3f36080c6ea414186a5d7c11c8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 38b8366e49..35e0b4aa0d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9e0488c6c0135932b6e76b0f3f3acd69ef65327e0a54daa59777f35da1aef26
\ No newline at end of file
+d85dd4de2d0989127e0ae6a2eec9d83a577777f8d5ba40700084a0b498016634
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 6050058e43..95567de799 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2388,8 +2388,9 @@ static SQLITE_NOINLINE int exprNodeIsConstantFunction(
    || (pDef->funcFlags & (SQLITE_FUNC_CONSTANT|SQLITE_FUNC_SLOCHNG))==0
   ){
     pWalker->eCode = 0;
+    return WRC_Abort;
   }
-  return WRC_Abort;
+  return WRC_Continue;
 }
 
 
diff --git a/test/values.test b/test/values.test
index 3dba3dda94..b96c9e5d23 100644
--- a/test/values.test
+++ b/test/values.test
@@ -401,6 +401,19 @@ do_execsql_test 12.2 {
   SELECT * FROM t1
 } {1 2 3 4 5 6}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 13.0 {
+  CREATE TABLE t1(x);
+  INSERT INTO t1 VALUES('xyz');
+
+  SELECT (
+      VALUES( (max(substr('abc', 1, 1), x)) ),
+      (123),
+      (456)
+      )
+  FROM t1;
+} {xyz}
 
 finish_test