From 0e8cbd5e785e32addc1e3d18d2905fa4ca3fbdbe Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 18 Sep 2024 16:33:07 +0000
Subject: [PATCH] Improvements to the scope of valueFromFunction().

FossilOrigin-Name: a0f39419cb5bdfa42ab2978cf3819e3d7821212996571f8251d2efbeaa26c603
---
 manifest      | 15 +++++++--------
 manifest.uuid |  2 +-
 src/vdbemem.c |  3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 6ec1524487..9252f1539a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\spreupdate\shook\sso\sthat\sit\sworks\swhen\sthe\s"old.*"\srow\shas\sa\scolumn\swith\sa\snon-NULL\sdefault\svalue\sthat\swas\sadded\sby\sALTER\sTABLE\sADD\sCOLUMN\safter\sthe\scurrent\srecord\swas\screated.
-D 2024-09-18T15:52:05.754
+C Improvements\sto\sthe\sscope\sof\svalueFromFunction().
+D 2024-09-18T16:33:07.107
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -843,7 +843,7 @@ F src/vdbeInt.h af7d7e8291edd0b19f2cd698e60e4d4031078f9a2f2328ac8f0b7efb134f8a1d
 F src/vdbeapi.c 483a391801ecacfeaa1d202c1d4dc2d7e520ba67566ca540868602117d6bdec5
 F src/vdbeaux.c 676dbee99b4febdd94bc9658667a2e3bc413c4c0e356242d90f98a1155d513e5
 F src/vdbeblob.c 255be187436da38b01f276c02e6a08103489bbe2a7c6c21537b7aecbe0e1f797
-F src/vdbemem.c 831a244831eaa45335f9ae276b50a7a82ee10d8c46c2c72492d4eb8c98d94d89
+F src/vdbemem.c df568ef0187e4be2788c35174f6d9b8566ab9475f9aff2d73907ed05aa5684b2
 F src/vdbesort.c d0a3c7056c081703c8b6d91ad60f17da5e062a5c64bf568ed0fa1b5f4cae311f
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
@@ -2213,9 +2213,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 54a3bbd5781f76bd73f5276b632d1107312f7a789134910793262317edd8359c 00a398cf900179aa5a8aab09fe4a671d99e7a31583282848ef39390f2ef246eb
-R ab206cf8e455565d06975b2e8cfc2717
-T +closed 00a398cf900179aa5a8aab09fe4a671d99e7a31583282848ef39390f2ef246eb
-U dan
-Z b1eae9775aa4a20e1661adc929c01183
+P 6a8c687904e92f00c1a5f768947545d2920ab9025bf8649adb0ea8053f5aec4e
+R d0975aa5990691eff64f3595ea61e3b3
+U drh
+Z b2a6cf77ba3faf4a74b60234c9026bd2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6197bc3230..b9cf121cd6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a8c687904e92f00c1a5f768947545d2920ab9025bf8649adb0ea8053f5aec4e
+a0f39419cb5bdfa42ab2978cf3819e3d7821212996571f8251d2efbeaa26c603
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 8e2aa4a6c9..0fc6b68f5e 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1534,7 +1534,8 @@ static int valueFromFunction(
       goto value_from_function_out;
     }
     for(i=0; i<nVal; i++){
-      rc = sqlite3ValueFromExpr(db, pList->a[i].pExpr, enc, aff, &apVal[i]);
+      rc = sqlite3Stat4ValueFromExpr(pCtx->pParse, pList->a[i].pExpr, aff,
+                                     &apVal[i]);
       if( apVal[i]==0 || rc!=SQLITE_OK ) goto value_from_function_out;
     }
   }