Remove old testcases() macros. Also remove surplus end-of-line whitespace.

FossilOrigin-Name: 54b41915ed8ef993b4116b2de00f3f4bba7570a1d28ad6bb93ba158a6b89eff3

diff --git a/manifest b/manifest
index 0413a9b465b93c3e4a1202753cccd61083e9e8fd..ec20425f980a23ba4de6f20998450323737b2a45 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Comment\simprovements\sto\son\sthe\sdistinct-agg\soptimization.\s\sShow\sa\sline\sin\nthe\sEQP\soutput\swhen\susing\san\sephemeral\stable\sto\simplement\sDISTINCT\son\san\naggregate.
-D 2021-03-24T19:44:01.340
+C Remove\sold\stestcases()\smacros.\s\sAlso\sremove\ssurplus\send-of-line\swhitespace.
+D 2021-03-24T23:30:06.986
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -542,7 +542,7 @@ F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c d95db73d3e6a5c689e5f6604b4d2521350e45f2a0f0f84f5a2dc2bfee56580a0
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 22b0309a334e683cb453bfb16ca5cd423bfebc16b3360fe424707baf900b5919
+F src/select.c 2d7a1f3d9f5970962b407cb4b38416fedc1a3b55efd010b40af375088653b6ce
 F src/shell.c.in dcce260883836c9b58847505fbccce8d5546af925046f7dacd9443e922ece036
 F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1911,7 +1911,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 ef4ac0ddd297bbd38351410c5a387e1628561b3f1bec9e4c2c9d76fbe29f955a
-R dcb5dee51b0acb34e00007490cfee341
+P 037ca79e6032ca962b4f6182187bc12a7d91170d73630c8cd6fb191d2c183ee4
+R 4917cb97cf7d2f0464ec24d8aec9c1db
 U drh
-Z c32591fb9c8184cbc930f8b40bd7a719
+Z b164854ca6947409852c4f03609cd09b

diff --git a/manifest.uuid b/manifest.uuid
index 3e4f52ae9178350d522bff5a743a65719294b273..ffa7cca0a0d2bac3cb64b0ae264b59ae8c447b50 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-037ca79e6032ca962b4f6182187bc12a7d91170d73630c8cd6fb191d2c183ee4
\ No newline at end of file
+54b41915ed8ef993b4116b2de00f3f4bba7570a1d28ad6bb93ba158a6b89eff3
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index e7ae01aca7171e14ac061af638e18f746dadd939..c6b36b6831e78996239117576aadcbed706175d0 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5811,8 +5811,6 @@ static void updateAccumulator(
       if( addrNext==0 ){ 
         addrNext = sqlite3VdbeMakeLabel(pParse);
       }
-      testcase( nArg==0 );  /* Error condition */
-      testcase( nArg>1 );   /* Also an error */
       pF->iDistinct = codeDistinct(pParse, eDistinctType, 
           pF->iDistinct, addrNext, pList, regAgg);
     }
@@ -6852,7 +6850,7 @@ int sqlite3Select(
 
       if( pAggInfo->nFunc==1 
        && pAggInfo->aFunc[0].iDistinct>=0
-       && pAggInfo->aFunc[0].pFExpr->x.pList 
+       && pAggInfo->aFunc[0].pFExpr->x.pList
       ){
         Expr *pExpr = pAggInfo->aFunc[0].pFExpr->x.pList->a[0].pExpr;
         pExpr = sqlite3ExprDup(db, pExpr, 0);