Correctly deal with IF-NULL-ROW operators when dealing with

indexed expressions in aggregates.

FossilOrigin-Name: 939cb47025354e2df047de7654c0b06f791957cfe4e904abe8892207cea90215

diff --git a/manifest b/manifest
index 9d1dae173c2aa43c85d58605b10e946fdb6c50d3..b0b68942588c967e5400983d58114a145e343460 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Take\scare\snot\sto\stry\sto\sadd\scomments\sto\sa\sTK_AGG_COLUMN\sopcode\sthat\sdoes\nnot\shave\san\sassociated\sTable\sobject\sbecause\sit\sis\sa\sreference\sto\san\sindexed\nexpression.
-D 2022-11-24T19:02:40.883
+C Correctly\sdeal\swith\sIF-NULL-ROW\soperators\swhen\sdealing\swith\nindexed\sexpressions\sin\saggregates.
+D 2022-11-24T23:35:27.975
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -641,7 +641,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 6df5dd2a0434f0921f82cd23449e75138f05435025aed37ad96f344a7a31dcdb
+F src/select.c c1cf437e18022df196bfe6e1f34a5fc1e871706665a0588863df5082d2e26563
 F src/shell.c.in 09cb15d7421c475f2d308f6a4312d8d690916ea5cb62ea1618f2f4ce5703af35
 F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2060,8 +2060,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 a0fd44f4e5a0ec83465203a0009f307ca50223833575895a3ebf8a289515714f
-R 54c8f77b091e9c38ba79b231dfbd47a4
+P 5fc23863e4a6388884ce061cd69546757b4c39d731bbb58a8121b92fd5144f7b
+R 9699b80135f783c01dc948dbd9568fdf
 U drh
-Z df0c8e1baf68d2353d611c7c44676419
+Z b4118428f98b75714904c3dd7e4b5c40
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 979e5c34b986837a89ebe9ef1749080b353926ec..5c7c74dae16da6a48568eec098fd277ae54cbbc5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5fc23863e4a6388884ce061cd69546757b4c39d731bbb58a8121b92fd5144f7b
\ No newline at end of file
+939cb47025354e2df047de7654c0b06f791957cfe4e904abe8892207cea90215
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index e9b62967136a3f497b2b157d88ee30bdff8492c5..2e6ad456146c9e6256eb601bd78f9bbdedc30a46 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -6318,6 +6318,7 @@ static int aggregateIdxEprRefToColCallback(Walker *pWalker, Expr *pExpr){
   if( pExpr->pAggInfo==0 ) return WRC_Continue;
   if( pExpr->op==TK_AGG_COLUMN ) return WRC_Continue;
   if( pExpr->op==TK_AGG_FUNCTION ) return WRC_Continue;
+  if( pExpr->op==TK_IF_NULL_ROW ) return WRC_Continue;
   pAggInfo = pExpr->pAggInfo;
   assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
   pCol = &pAggInfo->aCol[pExpr->iAgg];