From 0d08072b689e6ba734874d7b119b82698420628b Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Fri, 5 Mar 2021 15:29:22 +0000
Subject: [PATCH] Fix another problem with RETURNING clauses in UPDATEs against
 tables with virtual columns.

FossilOrigin-Name: f0ef5c76ab1a6568b9148b928277bf589d4cb7033c0acf3e6323879b656d8bd1
---
 manifest             | 17 +++++++----------
 manifest.uuid        |  2 +-
 src/resolve.c        |  4 ++--
 test/returning1.test | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/manifest b/manifest
index 2caaa19625..64e8e144eb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sfailure\sthat\scould\sbe\striggered\sby\sa\scorrelated\ssub-query\sin\sa\sRETURNING\sclause.
-D 2021-03-05T15:10:33.844
+C Fix\sanother\sproblem\swith\sRETURNING\sclauses\sin\sUPDATEs\sagainst\stables\swith\svirtual\scolumns.
+D 2021-03-05T15:29:22.704
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -540,7 +540,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/prepare.c f634a9e799a6b1c136d8ee12479cffa22862bfb807d307b1db406aa0cdb042a5
 F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c dcf55511b1cab1bf13902a6b982281716159171830681976ab294329ac6370e9
+F src/resolve.c 688070848f0a0c41bcc545a4b4b052921d9abc29ba3102985d3d6f7595d9637c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 297724a06fb8ecfcebae72f80c4d0f579bd28d428e011a61a75be366da644323
 F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947
@@ -1294,7 +1294,7 @@ F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b
 F test/releasetest_data.tcl d60628b6a04891e97cc4f5fbce08abe13c5b74cb23dcca5ac24800471a3bc6db
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
-F test/returning1.test 684e1c73d961422a7376c932fcdd6dacf02bad21d12f749cfe8c19991ef379f6
+F test/returning1.test 209b910c132cb2015bb1159f852c7124778004963c09095c42c3d2442110c56c
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
 F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
@@ -1909,10 +1909,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 90c6b9fcb0e15e2552fe5be53f8201f145bb535cc37b603d488eadf33438412b
-R 49752ff738d93adb39915eb6faab4334
-T *branch * returning-fix
-T *sym-returning-fix *
-T -sym-trunk *
+P 551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c
+R 9ce22f2ca863b622fffd6e204bd49f1c
 U dan
-Z 56c14ab2d57d092ff7169a5b82a04754
+Z c4bcd45de0d122be23d0f3375220e3aa
diff --git a/manifest.uuid b/manifest.uuid
index 4da52a810a..4e55bad5da 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-551260c8625828262809b1ef7acf5343a3527b7e167ca0cfd13b81e5ece0e66c
\ No newline at end of file
+f0ef5c76ab1a6568b9148b928277bf589d4cb7033c0acf3e6323879b656d8bd1
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index c60c2f9318..668498cb96 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -436,8 +436,8 @@ static int lookupName(
             pExpr->y.pTab = pTab;
             if( pParse->bReturning ){
               eNewExprOp = TK_REGISTER;
-              pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable
-                                + iCol + 1;
+              pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable +
+                 sqlite3TableColumnToStorage(pTab, iCol) + 1;
             }else{
               pExpr->iColumn = (i16)iCol;
               eNewExprOp = TK_TRIGGER;
diff --git a/test/returning1.test b/test/returning1.test
index 52fb8812a6..3c12536818 100644
--- a/test/returning1.test
+++ b/test/returning1.test
@@ -83,5 +83,37 @@ do_execsql_test 4.5 {
   RETURNING *, '|';
 } {2 3 4 | 4 100 6 | 5 6 7 |}
 
+#-------------------------------------------------------------------------
+# Test RETURNING on a table with virtual columns.
+#
+reset_db
+do_execsql_test 5.0 {
+  CREATE TABLE t1(xyz);
+  CREATE TABLE t2(a as (1+1), b);
+}
+
+do_execsql_test 5.1 {
+  UPDATE t2 SET b='123' WHERE b='abc' RETURNING (SELECT b FROM t1);
+} {}
+
+do_execsql_test 5.2 {
+  INSERT INTO t2(b) VALUES('abc');
+}
+
+do_execsql_test 5.3 {
+  UPDATE t2 SET b='123' WHERE b='abc' RETURNING (SELECT b FROM t1);
+} {{}}
+
+do_execsql_test 5.4 {
+  INSERT INTO t2(b) VALUES('abc');
+  INSERT INTO t1(xyz) VALUES(1);
+  UPDATE t2 SET b='123' WHERE b='abc' RETURNING b;
+} {123}
+
+do_execsql_test 5.5 {
+  INSERT INTO t2(b) VALUES('abc');
+  UPDATE t2 SET b='123' WHERE b='abc' RETURNING (SELECT b FROM t1);
+} {123}
 
 finish_test
+
-- 
2.39.5