From: drh <>
Date: Sat, 25 Mar 2023 21:01:11 +0000 (+0000)
Subject: When the left table of a RIGHT JOIN is used inside an aggregate function
X-Git-Tag: version-3.42.0~212^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de0416171b4f62bdd134ff6d97950f33050ad63a;p=thirdparty%2Fsqlite.git

When the left table of a RIGHT JOIN is used inside an aggregate function
and the left table employs an index on expressions, then make sure the
expressions evaluate to NULL for the cases where the left table should be
NULL.  Proposed fix for [forum:/forumpost/9b491e1deb|forum post 9b491e1deb].
More testing an analysis needed - there is a FIXME in this check-in.

FossilOrigin-Name: 3572b40a7dfc4acc35e72e08e79f64688f8737e57ac89e4d10e6b32bd5178c63
---

diff --git a/manifest b/manifest
index 5146a1ff25..543571e7e4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sbyte-code,\swhen\sthe\sresult\sof\san\sexpression\sneeds\sto\sbe\sin\sa\sparticular\nregister,\salways\suse\sthe\ssqlite3ExprCode()\sroutine\sbecause\sit\shas\sthe\ssmarts\nto\sknow\swhether\sto\suse\sOP_Copy\sor\sOP_SCopy.\s\sDo\snot\stry\sto\sOP_SCopy\sinline\nbecause\san\sOP_Copy\smight\sbe\srequired.\s\sFix\sfor\sthe\sproblem\sidentified\sby\n[forum:/forumpost/5522082cfc|forum\spost\s5522082cfc].
-D 2023-03-25T19:44:25.803
+C When\sthe\sleft\stable\sof\sa\sRIGHT\sJOIN\sis\sused\sinside\san\saggregate\sfunction\nand\sthe\sleft\stable\semploys\san\sindex\son\sexpressions,\sthen\smake\ssure\sthe\nexpressions\sevaluate\sto\sNULL\sfor\sthe\scases\swhere\sthe\sleft\stable\sshould\sbe\nNULL.\s\sProposed\sfix\sfor\s[forum:/forumpost/9b491e1deb|forum\spost\s9b491e1deb].\nMore\stesting\san\sanalysis\sneeded\s-\sthere\sis\sa\sFIXME\sin\sthis\scheck-in.
+D 2023-03-25T21:01:11.261
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -575,7 +575,7 @@ F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 201fe0763c52783d205c8c13cdd9d55c1bd5cb21c1f036753f99103b43284b90
-F src/expr.c fc8e484fbd2e512ac2cf0349af2f4da875fbeadd1713b0c241855a9848b035da
+F src/expr.c c6f7772fd988d86c9e9c34d19e62369cb26de6a783dbc5fe77d8d952e973425f
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
@@ -2051,8 +2051,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 a13c01d076d23f0de500e8e6283e803dfc96f0da7509c0d97d598d6b3e7b930b
-R e8d8985bf9d367c8fad5202d85b330d3
+P c104e5c6eeb89575319d9f94f49446142b06912fa8b283c19d46aa2ccddc5bda
+R 2bf850351800b6fc356e18027e4287ef
 U drh
-Z 42699f196a341272ef4b9eed5abfaeeb
+Z 3175f533ee39afc8052867b6068f0268
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a0a545044e..11883c7ef5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c104e5c6eeb89575319d9f94f49446142b06912fa8b283c19d46aa2ccddc5bda
\ No newline at end of file
+3572b40a7dfc4acc35e72e08e79f64688f8737e57ac89e4d10e6b32bd5178c63
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 9e2ae0ebd4..372e598036 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4222,7 +4222,13 @@ expr_code_doover:
       AggInfo *pAggInfo = pExpr->pAggInfo;
       struct AggInfo_col *pCol;
       assert( pAggInfo!=0 );
-      assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
+      assert( pExpr->iAgg>=0 );
+      if( pExpr->iAgg>=pAggInfo->nColumn ){
+        sqlite3VdbeAddOp2(v, OP_Null, 0, target);
+        /* FIXME:  Need to verify that tests run this opcode
+        ** Some kind of coverage macro.. VdbeCoverage(v);  tag-20230325-2 */
+        break;
+      }
       pCol = &pAggInfo->aCol[pExpr->iAgg];
       if( !pAggInfo->directMode ){
         return AggInfoColumnReg(pAggInfo, pExpr->iAgg);