diff options
| author | drh <drh@noemail.net> | 2012-12-07 22:18:54 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-12-07 22:18:54 +0000 |
| commit | 953f7611da21d43454ae5173f5fb1b69465a2d45 (patch) | |
| tree | 5b68b836a82c4ba563f31d536f51b2b8d53154ee /src/resolve.c | |
| parent | bd13d34b08ddc66a079f671bcbe96127b41da957 (diff) | |
| download | sqlite-953f7611da21d43454ae5173f5fb1b69465a2d45.tar.gz sqlite-953f7611da21d43454ae5173f5fb1b69465a2d45.zip | |
Fix a long-standing issue with the distinct-as-aggregate optimization that
only expressed when the new collating-sequence logic is turned on.
FossilOrigin-Name: 0aaf52a339808386984c30cca0c0c35ac2e70e7e
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/resolve.c b/src/resolve.c index 4b9d8fa14..d5d9d1c1a 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -111,20 +111,9 @@ static void resolveAlias( } pDup->iTable = pEList->a[iCol].iAlias; } -#if 1 /* FIXME */ - if( pExpr->flags & EP_Collate ){ - CollSeq *pColl = sqlite3ExprCollSeq(pParse, pExpr); - if( pColl ){ - pDup = sqlite3ExprAddCollateString(pParse, pDup, pColl->zName); - } - pDup->flags |= EP_Collate; - } -#else - /* Should be this: */ if( pExpr->op==TK_COLLATE ){ pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken); } -#endif /* Before calling sqlite3ExprDelete(), set the EP_Static flag. This ** prevents ExprDelete() from deleting the Expr structure itself, |