/ Check-in [8e724b38]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:For an ORDER BY on a compound SELECT, take the collating sequence from the left-most term of the compound.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | ticket-71e333e7
Files: files | file ages | folders
SHA1:8e724b383da1314909c9a05e9d941a26a9f50b95
User & Date: drh 2012-12-07 23:10:40
Context
2012-12-07
23:23
Improved error messages when column integers in an ORDER BY clause are out of range. check-in: bd960d93 user: drh tags: ticket-71e333e7
23:10
For an ORDER BY on a compound SELECT, take the collating sequence from the left-most term of the compound. check-in: 8e724b38 user: drh tags: ticket-71e333e7
22:54
Do not report missing collating functions while parsing the schema. Also remove a stray comment. check-in: e313edca user: drh tags: ticket-71e333e7
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/select.c.

2333
2334
2335
2336
2337
2338
2339



2340
2341
2342
2343
2344
2345
2346
      for(i=0; i<nOrderBy; i++){
        CollSeq *pColl;
        Expr *pTerm = pOrderBy->a[i].pExpr;
        if( pTerm->flags & EP_Collate ){
          pColl = sqlite3ExprCollSeq(pParse, pTerm);
        }else{
          pColl = multiSelectCollSeq(pParse, p, aPermute[i]);



        }
        pKeyMerge->aColl[i] = pColl;
        pKeyMerge->aSortOrder[i] = pOrderBy->a[i].sortOrder;
      }
    }
  }else{
    pKeyMerge = 0;







>
>
>







2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
      for(i=0; i<nOrderBy; i++){
        CollSeq *pColl;
        Expr *pTerm = pOrderBy->a[i].pExpr;
        if( pTerm->flags & EP_Collate ){
          pColl = sqlite3ExprCollSeq(pParse, pTerm);
        }else{
          pColl = multiSelectCollSeq(pParse, p, aPermute[i]);
          if( pColl==0 ) pColl = db->pDfltColl;
          pOrderBy->a[i].pExpr =
             sqlite3ExprAddCollateString(pParse, pTerm, pColl->zName);
        }
        pKeyMerge->aColl[i] = pColl;
        pKeyMerge->aSortOrder[i] = pOrderBy->a[i].sortOrder;
      }
    }
  }else{
    pKeyMerge = 0;