From: drh <drh@noemail.net>
Date: Tue, 22 Dec 2020 14:54:20 +0000 (+0000)
Subject: Simplification to the aggregate-function analysis error detection logic at
X-Git-Tag: version-3.35.0~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06ddb08f3f526a0fe018b04f3c0884a618ca5b2f;p=thirdparty%2Fsqlite.git

Simplification to the aggregate-function analysis error detection logic at
the end of sqlite3Select().

FossilOrigin-Name: 82884438e30ad8241f8249927fe92e0856d78b64d7ade38f3d5bb1c931d958d0
---

diff --git a/manifest b/manifest
index 44b381ddc0..23328371fb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\swith\sjoining\sUNION\sALL\ssub-queries\sagainst\sother\ssub-queries\sthat\scontain\sLEFT\sJOIN.
-D 2020-12-21T19:50:10.786
+C Simplification\sto\sthe\saggregate-function\sanalysis\serror\sdetection\slogic\sat\nthe\send\sof\ssqlite3Select().
+D 2020-12-22T14:54:20.628
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -540,7 +540,7 @@ F src/printf.c 30e92b638fac71dcd85cdea1d12ecfae354c9adee2c71e8e1ae4727cde7c91ed
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 1948a92ca9eab776632816b97e57c61d933474a78aad4f4ef835c916a83dbb1c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 610ca9552475310eb73d0f815c8558279910f3bbf5c5391476853c33400e302f
+F src/select.c 8626f34077f95d39a3a1b87bf19a3f107508dc075f946b8f44bf95360c9817bc
 F src/shell.c.in 6dd0d9260220f807d6d1b8e57dd6e163fe55bd0e97fa416c8c139162e3416134
 F src/sqlite.h.in 0af968a1fa3c717261e1df0ed105fa7bddb4d82de7e0adb3eab49e6aa81b4de7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1894,7 +1894,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 ef9733fe1c6b31849a5da1037d21915f82e0e4ab42d1a23ead8a121012f1bace
-R 080e6ee530ae0ca63a2553bcffc20a5b
-U dan
-Z a4fa2089cbf5bf716d3ea10acbb07023
+P d554f710a5abbe64022f47a14ef67227c861a8f0991d85d240434e9a709cf8b8
+R c76471a509e5f704181ef32470d9334a
+U drh
+Z 75d6a966e9bdbb44ee6e2e92dddb1757
diff --git a/manifest.uuid b/manifest.uuid
index 0372897b34..54fca24a6d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d554f710a5abbe64022f47a14ef67227c861a8f0991d85d240434e9a709cf8b8
\ No newline at end of file
+82884438e30ad8241f8249927fe92e0856d78b64d7ade38f3d5bb1c931d958d0
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 82174a02c8..46dd0739ba 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6970,15 +6970,13 @@ select_end:
   if( pAggInfo && !db->mallocFailed ){
     for(i=0; i<pAggInfo->nColumn; i++){
       Expr *pExpr = pAggInfo->aCol[i].pCExpr;
-      assert( pExpr!=0 || db->mallocFailed );
-      if( pExpr==0 ) continue;
+      assert( pExpr!=0 );
       assert( pExpr->pAggInfo==pAggInfo );
       assert( pExpr->iAgg==i );
     }
     for(i=0; i<pAggInfo->nFunc; i++){
       Expr *pExpr = pAggInfo->aFunc[i].pFExpr;
-      assert( pExpr!=0 || db->mallocFailed );
-      if( pExpr==0 ) continue;
+      assert( pExpr!=0 );
       assert( pExpr->pAggInfo==pAggInfo );
       assert( pExpr->iAgg==i );
     }