Correctly detect correlated subqueries when resolving names in RETURNING

clauses.

FossilOrigin-Name: b43cfa04922a401442b9d1708e3e4a88d3cfa2c591f9a6b253d99ba83f4b280a

diff --git a/manifest b/manifest
index 906f43411aec94385a5c1fb8c84286f5f6e2f3e5..c6adae91d0a837767269ce0345e0ac96f0627819 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sname\sresolution\sfor\sreferences\sto\sa\stable\sbegin\smodified\sfrom\nwithin\sa\ssubquery\sin\sthe\sRETURNING\sclause.
-D 2021-02-08T13:41:17.019
+C Correctly\sdetect\scorrelated\ssubqueries\swhen\sresolving\snames\sin\sRETURNING\nclauses.
+D 2021-02-08T15:56:01.736
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -539,7 +539,7 @@ F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/prepare.c f288cbc35f79eb32e162de7e80a63ebe00d80e639dcfac071bee11570cbdb16f
 F src/printf.c 30e92b638fac71dcd85cdea1d12ecfae354c9adee2c71e8e1ae4727cde7c91ed
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 3d77986c0b3b4254c6480844ecc21466251dedeb9dafe1c914581ef6e6683c76
+F src/resolve.c 89e4faf6171e179edf279905e8e45c4f9dd108777dc60716396729fbd7cb045e
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 738cb746189f721f59972993c13085fa2975c4cbfd04ba26445f3b42c81237dc
 F src/shell.c.in 9ebc74e4f05cfbd0f4a36060fdaeff1da4e9af4458358722bc08c5a1ab9a0879
@@ -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 7a8fe6463a9728bc4e34465688a059afb74f3c373cde8fdf570d5d148fdde04d
-R 961443c7bac5377cba010ae78e1611b5
+P 799d205bfa7945ee4a92dfec5fbf90a00b9a535e3171aab2ec46404f7efb0f78
+R 678a6afb8f9086ca3bbf2ce851a61869
 U drh
-Z d9624b59094cb9e104494bd0199a6b01
+Z 31510d8bd4a0645324a2097023f1e72e

diff --git a/manifest.uuid b/manifest.uuid
index cb3269e1189815c506fe26d00053cd898106781f..9aefd705d47f3e51f7c3350a5115108e8eb05b5e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-799d205bfa7945ee4a92dfec5fbf90a00b9a535e3171aab2ec46404f7efb0f78
\ No newline at end of file
+b43cfa04922a401442b9d1708e3e4a88d3cfa2c591f9a6b253d99ba83f4b280a
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 8642dffac9be60c69aa608b12f32cefa4662de6a..57ba75f30e276e7483872a6973c7efd208e2e6cc 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -383,7 +383,7 @@ static int lookupName(
         }else if( op!=TK_INSERT && zTab && sqlite3StrICmp("old",zTab)==0 ){
           pExpr->iTable = 0;
           pTab = pParse->pTriggerTab;
-        }else if( pParse->bReturning ){
+        }else if( pParse->bReturning && (pNC->ncFlags & NC_UBaseReg)!=0 ){
           pExpr->iTable = op!=TK_DELETE;
           pTab = pParse->pTriggerTab;
         }
@@ -435,14 +435,9 @@ static int lookupName(
           {
             pExpr->y.pTab = pTab;
             if( pParse->bReturning ){
-              NameContext *pUp = pNC;
-              while( (pUp->ncFlags & NC_UBaseReg)==0 && ALWAYS(pUp->pNext) ){
-                pUp = pUp->pNext;
-              }
-              assert( pUp->ncFlags & NC_UBaseReg );
               eNewExprOp = TK_REGISTER;
-              pExpr->iTable = pUp->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable
-                                   + iCol + 1;
+              pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable
+                                + iCol + 1;
             }else{
               pExpr->iColumn = (i16)iCol;
               eNewExprOp = TK_TRIGGER;