From: drh <> Date: Sat, 25 Mar 2023 23:56:15 +0000 (+0000) Subject: When the left table of a RIGHT JOIN is used inside an aggregate function and the... X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91187cf297460f61d02e7365250a99e0ecee02f7;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. FossilOrigin-Name: c51df77ebe5046fdcbd6b45990ba0eb295486a4ce12a1d47d0cacc8ec3310024 --- diff --git a/manifest b/manifest index aa4f06b1fc..22ec56d48b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sreading\ssqlite_stat4\sdata\sduring\squery\splanning,\sbe\ssure\sto\sexpand\nzeroblobs\sprior\sto\srunning\scomparisons. -D 2023-03-25T22:42:01.719 +C When\sthe\sleft\stable\sof\sa\sRIGHT\sJOIN\sis\sused\sinside\san\saggregate\sfunction\sand\sthe\sleft\stable\semploys\san\sindex\son\sexpressions,\sthen\smake\ssure\sthe\sexpressions\sevaluate\sto\sNULL\sfor\sthe\scases\swhere\sthe\sleft\stable\sshould\sbe\sNULL. +D 2023-03-25T23:56:15.055 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -571,7 +571,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 0c60fbb9959c89f5189a5c37f2a6b07f64617d965f0e528bd7490b050d2b6128 +F src/expr.c d3909cb38f7ac5f1287069f79e09b98c501dff0acd584b358512c0b49cbad8ae F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122 @@ -2045,9 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 2d439ccca4f8fd2bcf2178b4ebea54d6a6434303eeb0fe3c6b0be4f2ea5cbb60 -Q +5c8dd8dfcaab9c364b3a126ca35880ef57f5cecbe030771e646c934c8cf43709 -R 24570b072fd412a1fab95cd86964f54b +P 60f4d19d91ac29f5c84eaab77d5a92b2005a05ef89c8855dd800a1c457eafb16 +Q +ffe23af73fcb324df988a00be343654ce7078b7208647c4eb779d666b8297e7c +R 967a80f1a0348bde89b671270bcec25b U drh -Z dc732f5096d6f74aa901005a5cc8026e +Z d49a789c199e8a5db291d2e8648c2273 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 37da087942..6d462e6a8d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60f4d19d91ac29f5c84eaab77d5a92b2005a05ef89c8855dd800a1c457eafb16 \ No newline at end of file +c51df77ebe5046fdcbd6b45990ba0eb295486a4ce12a1d47d0cacc8ec3310024 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 15b7a7f2df..06e4ac8396 100644 --- a/src/expr.c +++ b/src/expr.c @@ -4222,7 +4222,19 @@ expr_code_doover: AggInfo *pAggInfo = pExpr->pAggInfo; struct AggInfo_col *pCol; assert( pAggInfo!=0 ); - assert( pExpr->iAgg>=0 && pExpr->iAggnColumn ); + assert( pExpr->iAgg>=0 ); + if( pExpr->iAgg>=pAggInfo->nColumn ){ + /* Happens when the left table of a RIGHT JOIN is null and + ** is using an expression index */ + sqlite3VdbeAddOp2(v, OP_Null, 0, target); +#ifdef SQLITE_VDBE_COVERAGE + /* Verify that the OP_Null above is exercised by tests + ** tag-20230325-2 */ + sqlite3VdbeAddOp2(v, OP_NotNull, target, 1); + VdbeCoverageNeverTaken(v); +#endif + break; + } pCol = &pAggInfo->aCol[pExpr->iAgg]; if( !pAggInfo->directMode ){ return AggInfoColumnReg(pAggInfo, pExpr->iAgg);