Improvements to the scope of valueFromFunction().

FossilOrigin-Name: b021399a6e93afbb3368a5ae94c0f29c97ec6603bf9a5b7f86ca63c94590c2c3

diff --git a/manifest b/manifest
index 2eb95e3f0bd1a6b555ae7290b19ad55e4ffe1bb2..d2410e7e2259d58142d65b7e908cb10ae0289afb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sthe\squery\splanner\saccess\sto\sthe\sargument\sof\sLIMIT\seven\sif\sthat\nargument\sis\sa\sbound\sparameter.
-D 2024-06-07T00:20:53.796
+C Improvements\sto\sthe\sscope\sof\svalueFromFunction().
+D 2024-09-18T18:04:30.307
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -596,7 +596,7 @@ F src/vdbeInt.h 1a928793190675799194bdee2778f13b10ee42bc20bc03b6635687e4d3d80874
 F src/vdbeapi.c 2ddd60f4a351f15ee98d841e346af16111ad59dfa4d25d2dd4012e9875bf7d92
 F src/vdbeaux.c cb1fcb880d19df072bdd8e4ace38ee7c3477ac72cc567cc47f92a640cd352a5c
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
-F src/vdbemem.c dd2ee49255c4c5450f2b0887ef44cea8faa1cd7a46501b39a1a82b113ae418e3
+F src/vdbemem.c 63ffb5a4c685de1fa2efefbfea4019de2e3628704de2c77b9564d578043e2dbf
 F src/vdbesort.c 66592d478dbb46f19aed0b42222325eadb84deb40a90eebe25c6e7c1d8468f47
 F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
 F src/vtab.c 4c5959e00b7a142198d178e3a822f4e05f36f2d1a3c57657373f9487154fc06b
@@ -1822,9 +1822,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 357d9513d2bd13c4e9f227300d43a04d13ae1d34b0b5ec55e8b94eb3204d1921 b44f2676716be37d85eb6f207e187d997fc9d7493883bd7f1541cc7ae52475be
-R 9f9e9ebe59db314328728ce7f586f762
-T +closed b44f2676716be37d85eb6f207e187d997fc9d7493883bd7f1541cc7ae52475be
+P 148d505ca08adcc776748d4d01fde022ab5add745d6b2573922a66e516b51681
+Q +a0f39419cb5bdfa42ab2978cf3819e3d7821212996571f8251d2efbeaa26c603
+R 1aec0b9a4c85c0e5c4b4a0fd66b01c71
 U drh
-Z c5c9963c3da9c05c5c5ef1d81a5e586f
+Z 252815416379df1b7cdbf62123df53d6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c296703f31f085dda37f4568c73310bb793488da..929717d03edb48b07a9c1daaaf7da299c813f54b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-148d505ca08adcc776748d4d01fde022ab5add745d6b2573922a66e516b51681
\ No newline at end of file
+b021399a6e93afbb3368a5ae94c0f29c97ec6603bf9a5b7f86ca63c94590c2c3

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 80d494867c71058c707de1f3542d2554a5fc0a07..e88f5ad4beafaf38e09d44bccca451b7b617efbb 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1364,7 +1364,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;
     }
   }