Add an ALWAYS on branch that was made always-true by the DISTINCT ORDER BY

fix.

FossilOrigin-Name: c29ebcb0be8e969c359c077bd4ce752a9c952d2659062868f12efdd2cc77186d

diff --git a/manifest b/manifest
index 1fc4f1f48b174d1e6d11ad482e071d2a8b56a701..8ad88c14141f6602da5f9227cb62908c3fac9f07 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sdoing\sa\sDISTINCT\saggregate\sthat\scontains\san\sORDER\sBY,\sonly\sthe\narguments\sto\sthe\saggregate\sneed\sto\sbe\sdistinct,\snot\sthe\sORDER\sBY\sterms.
-D 2023-10-25T14:54:16.468
+C Add\san\sALWAYS\son\sbranch\sthat\swas\smade\salways-true\sby\sthe\sDISTINCT\sORDER\sBY\nfix.
+D 2023-10-25T15:30:11.779
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -721,7 +721,7 @@ F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 845936a85dd39be43a7b76aa0a5c1e68105bf0b98e4986124f78052254e3fe5b
+F src/select.c 64c9bc7494f3d220a27498137551762c25458282388ea9ac0a710dd6d5dc1510
 F src/shell.c.in acc452c414fddd10289d165be3c89a7a2c36c919def04c93fb7dd11ac022e6ed
 F src/sqlite.h.in 81c70644aeef9c974f72c9cadeb505ebb9441d2f6db594c018604ae935a12e6e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2138,8 +2138,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 cc66f526bd58c110cac027583f636099fa05b2b56d7ea9807b554cd950c1bf3c
-R 2001118bd227fdbabf4cf18d4c63742c
+P d2dbbdf7194bab4e5e3b74d3dbffb012a335829824c775c72dd7347c013d2125
+R 69224f49fd227efd4871d1e294714787
 U drh
-Z 9e38892552611c3668b16789a65f9f49
+Z 09c12c04ae80362f6524540f0fd3a848
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2a3eea65c3ca2a2561e62b48637df24b5436ffbd..d996fb461a8f728897e0734232db3325576474e0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2dbbdf7194bab4e5e3b74d3dbffb012a335829824c775c72dd7347c013d2125
\ No newline at end of file
+c29ebcb0be8e969c359c077bd4ce752a9c952d2659062868f12efdd2cc77186d
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 55303217443994e2f875de8d4fc9ef4894e46121..0dac37b10cf04a18fa84d351268c45c9a41c0969 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -6715,7 +6715,7 @@ static void finalizeAggFunctions(Parse *pParse, AggInfo *pAggInfo){
         assert( ExprUseXList(pF->pFExpr->pLeft) );
         assert( pF->pFExpr->pLeft->x.pList!=0 );
         nKey = pF->pFExpr->pLeft->x.pList->nExpr;
-        if( !pF->bOBUnique ) nKey++;
+        if( ALWAYS(!pF->bOBUnique) ) nKey++;
       }
       iTop = sqlite3VdbeAddOp1(v, OP_Rewind, pF->iOBTab); VdbeCoverage(v);
       for(j=nArg-1; j>=0; j--){