Improvements to the scope of valueFromFunction().

D. Richard Hipp · D. Richard Hipp · commit 23fb7d117694 · 2024-09-18T16:33:07.000Z
diff --git 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;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1534,7 +1534,8 @@ static int valueFromFunction(`
`1534`	`1534`	`goto value_from_function_out;`
`1535`	`1535`	`}`
`1536`	`1536`	`for(i=0; i<nVal; i++){`
`1537`		`- rc = sqlite3ValueFromExpr(db, pList->a[i].pExpr, enc, aff, &apVal[i]);`
	`1537`	`+ rc = sqlite3Stat4ValueFromExpr(pCtx->pParse, pList->a[i].pExpr, aff,`
	`1538`	`+ &apVal[i]);`
`1538`	`1539`	`if( apVal[i]==0 \|\| rc!=SQLITE_OK ) goto value_from_function_out;`
`1539`	`1540`	`}`
`1540`	`1541`	`}`