When resolving names in the RETURNING clause, do not accept trigger names

even within subquires.

FossilOrigin-Name: 8541c71b35fd529ee3addd51fd51279bc1fb35dd6b6ceee3ed22c06df0e3d02e

4 files changed, 30 insertions, 11 deletions

diff --git a/manifest b/manifest
index bd7a03764..677dd5986 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sresolving\scolumn\snames\sin\sthe\sRETURNING\sclause,\sdo\snot\signore\san\nincorrect\stable\sname\squalifier.\s\sRaise\san\serror\sinstead.
-D 2021-03-31T17:49:52.900
+C When\sresolving\snames\sin\sthe\sRETURNING\sclause,\sdo\snot\saccept\strigger\snames\neven\swithin\ssubquires.
+D 2021-04-01T11:30:23.479
 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 e21b54489b5c73b06ada15e6fc79b5c6f64b06701924a6ca98944ae59e06256f
 F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 317086e685c7764e8e45626826b84a4fde7dcfce82543feb47143d633f355621
+F src/resolve.c fec151c9c33a6fa2e93d10b4e8cd4084a7c773df36fb3ec6788eb89ae493a1a4
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 734cf12e42f81f2fe461e41214e6552375e55b62a802784a4f0066ac592e7f4a
 F src/shell.c.in aa28256887d049badaf93aa30ab5c76a2ec88143a674d685c0e739056702e5c3
@@ -1295,7 +1295,7 @@ F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b
 F test/releasetest_data.tcl 3d41ddb3f04f474ac9d925485da24ce6576ff0ebc4c7201c8a340bc09846c261
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
-F test/returning1.test 8cee2d563f7b0fcd77cfaaa277805566fa0868e54dab299d44600e4e0a0b01df
+F test/returning1.test ce2192b40045cc94d53ac5ec5789a72a3ade233a6ea6e29666e296d151b59479
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
 F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
@@ -1910,8 +1910,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 77a30f3f7a4094cf43d24f062f6fd5c5981268899f809ba068bb28287fc87839
-Q +51d5c50b2fb373e4c7ddb7e26657c26ad39dc9c2fc629bba5c2522b4150d8fac
-R c95f4a5567d1ff895225c476453fcc5f
+P 3b916924cef383f3d395e1f10aed6584d22d39a26f3b3c9919bd1afc0db635aa
+Q +fd4ea3f626b6e4957d56c2369be711895735cfc37cfde65650a6682ad5a3eb1a
+R abaa54984fae40fe105f945591525461
 U drh
-Z 2b95241ee49decf487cf2d2a9bf3f21e
+Z 812e0619806a3ae4e17f81c7173417d8
diff --git a/manifest.uuid b/manifest.uuid
index c0f5e5532..27dbe2c8b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b916924cef383f3d395e1f10aed6584d22d39a26f3b3c9919bd1afc0db635aa
\ No newline at end of file
+8541c71b35fd529ee3addd51fd51279bc1fb35dd6b6ceee3ed22c06df0e3d02e
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index f2578abff..5ddfa4df3 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -376,8 +376,10 @@ static int lookupName(
       if( pParse->pTriggerTab!=0 ){
         int op = pParse->eTriggerOp;
         assert( op==TK_DELETE || op==TK_UPDATE || op==TK_INSERT );
-        if( pParse->bReturning && (pNC->ncFlags & NC_UBaseReg)!=0 ){
-          if( zTab==0 || sqlite3StrICmp(zTab,pParse->pTriggerTab->zName)==0 ){
+        if( pParse->bReturning ){
+          if( (pNC->ncFlags & NC_UBaseReg)!=0
+           && (zTab==0 || sqlite3StrICmp(zTab,pParse->pTriggerTab->zName)==0)
+          ){
             pExpr->iTable = op!=TK_DELETE;
             pTab = pParse->pTriggerTab;
           }
diff --git a/test/returning1.test b/test/returning1.test
index 6c12b6833..410b285e9 100644
--- a/test/returning1.test
+++ b/test/returning1.test
@@ -166,6 +166,23 @@ do_catchsql_test 7.8 {
   UPDATE t1 AS alias SET b=alias.b+1000 RETURNING t1.b;
 } {0 1032}
 
+# Forum: https://sqlite.org/forum/info/34c81d83c9177f46
+reset_db
+do_execsql_test 8.1 {
+  CREATE TABLE t1(a);
+  CREATE TABLE t2(b,c);
+  INSERT INTO t1 VALUES(1);
+  INSERT INTO t2 VALUES(3,40);
+} {}
+do_catchsql_test 8.2 {
+  INSERT INTO t1 VALUES(3) RETURNING a, (SELECT c FROM t2 WHERE new.a=t2.b) AS x;
+} {1 {no such column: new.a}}
+do_catchsql_test 8.3 {
+  INSERT INTO t1 VALUES(3) RETURNING a, (SELECT c FROM t2 WHERE old.a=t2.b) AS x;
+} {1 {no such column: old.a}}
+do_catchsql_test 8.4 {
+  INSERT INTO t1 VALUES(3) RETURNING a, (SELECT c FROM t2 WHERE t1.a=t2.b) AS x;
+} {0 {3 40}}
 
 finish_test