diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 7 | ||||
| -rw-r--r-- | src/select.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c index ce6e29578..0e4a3cb1f 100644 --- a/src/expr.c +++ b/src/expr.c @@ -112,7 +112,12 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ continue; } if( op==TK_COLLATE ){ - pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); + if( db->init.busy ){ + /* Do not report errors when parsing while the schema */ + pColl = sqlite3FindCollSeq(db, ENC(db), p->u.zToken, 0); + }else{ + pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken); + } break; } if( p->pTab!=0 diff --git a/src/select.c b/src/select.c index 6a7128683..5b8f2f09a 100644 --- a/src/select.c +++ b/src/select.c @@ -2337,7 +2337,6 @@ static int multiSelectOrderBy( pColl = sqlite3ExprCollSeq(pParse, pTerm); }else{ pColl = multiSelectCollSeq(pParse, p, aPermute[i]); -// pTerm->flags |= EP_Collate; } pKeyMerge->aColl[i] = pColl; pKeyMerge->aSortOrder[i] = pOrderBy->a[i].sortOrder; |