From: drh <>
Date: Sun, 31 Jan 2021 12:41:20 +0000 (+0000)
Subject: When setting the number of result columns in a RETURNING trigger, be sure
X-Git-Tag: version-3.35.0~118^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=662fe7964744f40f5e75e71a5c2f50cbc3817a72;p=thirdparty%2Fsqlite.git

When setting the number of result columns in a RETURNING trigger, be sure
to set that value in the top-level bytecode program, not in the immediate
caller of the trigger.

FossilOrigin-Name: 1f1ce7ceb9807d22efea496f33908040ee196a31cd192f27ec0fb3e23afb729c
---

diff --git a/manifest b/manifest
index 33c213e5b0..0955fb3250 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\son\sthe\snew\scode.
-D 2021-01-30T21:55:38.166
+C When\ssetting\sthe\snumber\sof\sresult\scolumns\sin\sa\sRETURNING\strigger,\sbe\ssure\nto\sset\sthat\svalue\sin\sthe\stop-level\sbytecode\sprogram,\snot\sin\sthe\simmediate\ncaller\sof\sthe\strigger.
+D 2021-01-31T12:41:20.387
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -607,7 +607,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c c64c49d7c2ec4490c2fef1f24350167ba16b03b0c6cee58ad1a1d70a4325d4e9
 F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
-F src/trigger.c 207168409c59f346df3a8b4556f0f35fdf721cd35e06fb3c75ea76b7ce95ed35
+F src/trigger.c 424f81a5631a06dda99d70c6bfa3e7e6ead74ab9eb757b77f75a14a18ef7d419
 F src/update.c 3dbc7189ffcf361c2149f1b1d0841a8a9689d27f15c5e72e6f14ebc447e6b0c0
 F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@ -1899,7 +1899,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6bb6de42b62acd35ade6c95a11bb4c9b35e7e9a24620731ae36364c4d5c3bc31
-R 9e0cb8b9c72d2bfe4a3d882f4b872a05
+P a38f0c1d7c1d7635732ac370d8fbc7e6a2005378e4621da7bc4f51a2f99912d1
+R 34ba0ebdbec7699355883290972263ed
 U drh
-Z 296f4bf266bf4139fc832ba9efb3047c
+Z 1a944974e641f069223aa2fcb2319010
diff --git a/manifest.uuid b/manifest.uuid
index 32aff6c58f..ca1e4d426c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a38f0c1d7c1d7635732ac370d8fbc7e6a2005378e4621da7bc4f51a2f99912d1
\ No newline at end of file
+1f1ce7ceb9807d22efea496f33908040ee196a31cd192f27ec0fb3e23afb729c
\ No newline at end of file
diff --git a/src/trigger.c b/src/trigger.c
index 5463d2dd0f..ae86c7c9af 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -1064,7 +1064,7 @@ static TriggerPrg *codeRowTrigger(
       pProgram->aOp = sqlite3VdbeTakeOpArray(v, &pProgram->nOp, &pTop->nMaxArg);
     }
     if( pTrigger->bReturning ){
-      sqlite3VdbeColumnInfoXfer(pParse->pVdbe, v);
+      sqlite3VdbeColumnInfoXfer(sqlite3ParseToplevel(pParse)->pVdbe, v);
     }
     pProgram->nMem = pSubParse->nMem;
     pProgram->nCsr = pSubParse->nTab;