paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve on the previous checkin. Still a bit slow.

Browse Source 
FossilOrigin-Name: c1fb41aa7b7207b81ee1d5d32da3380b36d694033b87a2873981e0c6437ba956
This commit is contained in:
dan
2018-06-29 19:54:51 +00:00
parent 59ff42516c
commit 769309fcf3
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tokenize.c
+9 -10
View File
@@ -222,20 +222,21 @@ static int windowGetToken(const unsigned char **pz){
** uses windowGetToken(). This is to avoid recursion if the input is similar
** to "window window window window".
*/
static void analyzeWindowKeyword(const unsigned char *z, int *tokenType){
static int analyzeWindowKeyword(const unsigned char *z){
int t;
assert( *tokenType==TK_WINDOW );
int ret = TK_WINDOW;
while( (t = windowGetToken(&z))==TK_SPACE );
if( t!=TK_ID && t!=TK_STRING
&& t!=TK_JOIN_KW && sqlite3ParserFallback(t)!=TK_ID
){
*tokenType = TK_ID;
ret = TK_ID;
}else{
while( (t = windowGetToken(&z))==TK_SPACE );
if( t!=TK_AS ){
*tokenType = TK_ID;
ret = TK_ID;
}
}
return ret;
}
/*
@@ -482,12 +483,7 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
break;
}
*tokenType = TK_ID;
keywordCode((char*)z, i, tokenType);
if( *tokenType==TK_WINDOW ){
assert( i==6 );
analyzeWindowKeyword(&z[6], tokenType);
}
return i;
return keywordCode((char*)z, i, tokenType);
}
case CC_X: {
#ifndef SQLITE_OMIT_BLOB_LITERAL
@@ -594,6 +590,9 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
}
zSql += n;
}else{
if( tokenType==TK_WINDOW ){
tokenType = analyzeWindowKeyword((const u8*)&zSql[6]);
}
pParse->sLastToken.z = zSql;
pParse->sLastToken.n = n;
sqlite3Parser(pEngine, tokenType, pParse->sLastToken);