database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

:-) (CVS 77)

Browse Source 
FossilOrigin-Name: b3fb15ccde399318bde8c87362ecaa3a744f0680
This commit is contained in:
drh
2000-06-08 01:55:29 +00:00
parent 92dba24b69
commit 92cd52f5b6
4 changed files with 143 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/select.c
View File

@ -24,7 +24,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements.
**
** $Id: select.c,v 1.18 2000/06/08 00:28:52 drh Exp $
** $Id: select.c,v 1.19 2000/06/08 01:55:30 drh Exp $
*/
#include "sqliteInt.h"
@ -366,18 +366,20 @@ static int matchOrderbyToColumn(
return 1;
}
if( pSelect->pPrior ){
matchOrderbyToColumn(pParse, pSelect->pPrior, pOrderBy, iTable, 0);
if( matchOrderbyToColumn(pParse, pSelect->pPrior, pOrderBy, iTable, 0) ){
return 1;
}
}
pEList = pSelect->pEList;
for(i=0; i<pOrderBy->nExpr; i++){
Expr *pE = pOrderBy->a[i].pExpr;
int match = 0;
if( pOrderBy->a[i].done ) continue;
for(j=0; j<pEList->nExpr; j++){
int match = 0;
if( pEList->a[i].zName && (pE->op==TK_ID || pE->op==TK_STRING) ){
char *zName = pEList->a[i].zName;
char *zLabel = 0;
sqliteSetString(&zLabel, pE->token.z, pE->token.n, 0);
sqliteSetNString(&zLabel, pE->token.z, pE->token.n, 0);
sqliteDequote(zLabel);
if( sqliteStrICmp(zName, zLabel)==0 ){
match = 1;
@ -394,7 +396,7 @@ static int matchOrderbyToColumn(
break;
}
}
if( mustComplete ){
if( !match && mustComplete ){
char zBuf[30];
sprintf(zBuf,"%d",i+1);
sqliteSetString(&pParse->zErrMsg, "ORDER BY term number ", zBuf,